Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df2b6af4 authored by Roberto Bergantinos Corpas's avatar Roberto Bergantinos Corpas Committed by Greg Kroah-Hartman
Browse files

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



commit 31fad7d41e73731f05b8053d17078638cf850fa6 upstream.

 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: default avatarRoberto Bergantinos Corpas <rbergant@redhat.com>
Acked-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf07331c

fs/cifs/file.c

+3 −1
Original line number Diff line number Diff line
@@ -2892,7 +2892,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;

		}