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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 18CE9C4360F for ; Fri, 22 Mar 2019 12:51:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D48362082C for ; Fri, 22 Mar 2019 12:51:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553259061; bh=oEDyYdLdERB/CuEcFpE0ltYVIM/Haem6IYV6R0aPdHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=txwp7XKJ+f7X+8adp+XtF7FeNNf3xFgjnwKR+cFrsld14O3tkY/KyfLa7TsuNSKOZ LYB0COtb7VmiHi7fU0NyotbTbg0lpMt4MMYlTzzz4ZNRn76Pjud9URpq10VNBRVatI eA7yROrEnk7CtLwaZpOnyo1ymM64Z1FF9+LDhWPE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732851AbfCVLzD (ORCPT ); Fri, 22 Mar 2019 07:55:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:59630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732490AbfCVLzD (ORCPT ); Fri, 22 Mar 2019 07:55:03 -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 898572082C; Fri, 22 Mar 2019 11:55:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255703; bh=oEDyYdLdERB/CuEcFpE0ltYVIM/Haem6IYV6R0aPdHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RHdRk2+VtguKU7laSWda/NP75U6tImsvB1k1o2iqYrA19Y44GbJUIoPBUUTfEPJeq 6N4HpJKWqYn0csFhXA2SwsaOSVx5wVxJk/KUgIxPiIU8wOSRXA84082ygkwDPbf6GP jPRQxjpxMCzz7P0k+GdXpV4T3g4NO+QrIQqp6oZg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust Subject: [PATCH 4.14 155/183] NFS: Fix an I/O request leakage in nfs_do_recoalesce Date: Fri, 22 Mar 2019 12:16:23 +0100 Message-Id: <20190322111253.123996382@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111241.819468003@linuxfoundation.org> References: <20190322111241.819468003@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Trond Myklebust commit 4d91969ed4dbcefd0e78f77494f0cb8fada9048a upstream. Whether we need to exit early, or just reprocess the list, we must not lost track of the request which failed to get recoalesced. Fixes: 03d5eb65b538 ("NFS: Fix a memory leak in nfs_do_recoalesce") Signed-off-by: Trond Myklebust Cc: stable@vger.kernel.org # v4.0+ Signed-off-by: Greg Kroah-Hartman --- fs/nfs/pagelist.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -1092,7 +1092,6 @@ static int nfs_do_recoalesce(struct nfs_ struct nfs_page *req; req = list_first_entry(&head, struct nfs_page, wb_list); - nfs_list_remove_request(req); if (__nfs_pageio_add_request(desc, req)) continue; if (desc->pg_error < 0) {