From patchwork Tue Feb 19 13:53:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10819919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 791396CB for ; Tue, 19 Feb 2019 13:55:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6752D28A0D for ; Tue, 19 Feb 2019 13:55:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B90B299F2; Tue, 19 Feb 2019 13:55:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10E0D28A0D for ; Tue, 19 Feb 2019 13:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726384AbfBSNzR (ORCPT ); Tue, 19 Feb 2019 08:55:17 -0500 Received: from mail-it1-f193.google.com ([209.85.166.193]:35122 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725794AbfBSNzR (ORCPT ); Tue, 19 Feb 2019 08:55:17 -0500 Received: by mail-it1-f193.google.com with SMTP id v72so6329886itc.0 for ; Tue, 19 Feb 2019 05:55:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=njCUfkgXUj/lPfViFXNEQbF8PDFKgBs5hgYZS/IoSVw=; b=FaLjLu4xMKqMkPCuTEJ36ptHJrCrHxoM5Mk0M0ZMiE1hGH9kdYZFsGgiAFhM9RzYYZ J7Amymo8OZ+PvoMdP7vjMK7vBNWu1w/gopimyqZefVLNcI6NG0d2VxCD6fpxOBmsdXXP DqZO5duF2O6UQ7Anrj4CzMRMeStet92nUgDqGu6/v/CaUM/ocuUnm/dNiVqcPoeATCjF F7hkcATqKDtmPTtlCSNn/XMt9UEW/QTZpqoxp+Sa2oDp81zgObQSuMI4EM3v5IxE0mCM NiLapkvpMzZEwmnPVW0ROj3kiwNVLAks88wRRRG2SaxwONWsNfgjCqRM/6Z8iMiFs+sv 2Gjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=njCUfkgXUj/lPfViFXNEQbF8PDFKgBs5hgYZS/IoSVw=; b=k/i3QsDK46TRirQuMyKrkloguw2mxHpylhDweTAs56ycBWqXCXyUrlrISCPDtifhtE AinlKXwzxFH/jHzwFW2GaOQKn2BwLU6c1kuW0eRgk82DMCgqep4gyXJr6whINKMHjSVQ BAGH8jZ7mmGDHED3EwGcKX2mQ01O7olK/ikPkh2dk06cO7el9YXllYhK2Pazm6ful94C SWElOGZt2vK3ftjaonUOVSvgPLGQ37Ur7yOuiFbMp3on4FX3fxeNF08dp3kdtZMxvX+q hvg2j7ZFlBjk9E2ydL04RcrgufD4qsz5Gxg1AjRiUHijCvbDNZ6iirNdBvT9xzXHkuwf t1Lw== X-Gm-Message-State: AHQUAuaC0HXZM0X5HO6gckvxytGMNxteINa6+j6CtiSPo6qbqSwUP5oN 7Vnlt0rmofE31uM9Z/Zu1qbSohU= X-Google-Smtp-Source: AHgI3Iba/lPxgXaWYVuzWFq8+Bx3j+wX2SBnie/OyUlUbRsTH7hozmjTjBY1pXxrxaWQ5kKYbjefdQ== X-Received: by 2002:a05:6638:398:: with SMTP id y24mr5455491jap.33.1550584515749; Tue, 19 Feb 2019 05:55:15 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id c133sm1196313itc.24.2019.02.19.05.55.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Feb 2019 05:55:15 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 2/8] NFS: Fix an I/O request leakage in nfs_do_recoalesce Date: Tue, 19 Feb 2019 08:53:05 -0500 Message-Id: <20190219135311.119300-3-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190219135311.119300-2-trond.myklebust@hammerspace.com> References: <20190219135311.119300-1-trond.myklebust@hammerspace.com> <20190219135311.119300-2-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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+ --- fs/nfs/pagelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 301880a3ad8e..03bde9a41451 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -1092,7 +1092,6 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc) 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) {