Commit 31fad7d4 authored May 28, 2019 by Roberto Bergantinos Corpas Committed by Steve French May 29, 2019

CIFS: cifs_read_allocate_pages: don't iterate through whole page array on ENOMEM



 In cifs_read_allocate_pages, in case of ENOMEM, we go through
whole rdata->pages array but we have failed the allocation before
nr_pages, therefore we may end up calling put_page with NULL
pointer, causing oops

Signed-off-by: Roberto Bergantinos Corpas <rbergant@redhat.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>

parent 50fbc13d

fs/cifs/file.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3216,7 +3216,9 @@ cifs_read_allocate_pages(struct cifs_readdata *rdata, unsigned int nr_pages)
		}

		if (rc) {
		for (i = 0; i < nr_pages; i++) {
		unsigned int nr_page_failed = i;

		for (i = 0; i < nr_page_failed; i++) {
		put_page(rdata->pages[i]);
		rdata->pages[i] = NULL;
		}

Admin message