From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD756C468BD for ; Fri, 7 Jun 2019 15:55:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE16D2133D for ; Fri, 7 Jun 2019 15:55:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922932; bh=36eC9LzTEo0QMP/ymP9uy/gU8UGDQFvYsE4YirRunko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GnKSc3Y+3fPZKyGfAN2bUELwgVNQa02l/DE8dMMfUx6RCq8A3X4omLozh9N2jWFFv pMj9gwnY8JOq6ppAABn9409mrKFvKd508oKnrRw+sHq7Qpfn5aqgIlnn7aaSYyKkgi NVXksLbSLBXLaGehKiuWKNCDEYuT+GEoBOGEw8OA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731267AbfFGPpl (ORCPT ); Fri, 7 Jun 2019 11:45:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:57692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731260AbfFGPpl (ORCPT ); Fri, 7 Jun 2019 11:45:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F7B321479; Fri, 7 Jun 2019 15:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922340; bh=36eC9LzTEo0QMP/ymP9uy/gU8UGDQFvYsE4YirRunko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ayQQS9kUOgDFnkstba+DxBsdU9tE6G694MmaYduIShIzMxGdWSArp8uudxCSJ269u S0ykwXgDSHL/RvJXOXjJ/m0pqIXo5P5kpoH7JeVS1O+o1eK75mUy254D0gBjKJ/DQh Df6O2pBzbmDciexnyW18M1a+mmlF3BKPU1t960Xs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Roberto Bergantinos Corpas , Pavel Shilovsky , Steve French Subject: [PATCH 4.19 53/73] CIFS: cifs_read_allocate_pages: dont iterate through whole page array on ENOMEM Date: Fri, 7 Jun 2019 17:39:40 +0200 Message-Id: <20190607153854.978314671@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.669070800@linuxfoundation.org> References: <20190607153848.669070800@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Roberto Bergantinos Corpas 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: Roberto Bergantinos Corpas Acked-by: Pavel Shilovsky Signed-off-by: Steve French CC: Stable Signed-off-by: Greg Kroah-Hartman --- fs/cifs/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2988,7 +2988,9 @@ cifs_read_allocate_pages(struct cifs_rea } 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; }