Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp9755871rwp; Thu, 20 Jul 2023 09:12:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlG+dzwePt68qzEOx44n1Wytjsai6r/QDW/dG99FDddES0g9skSB/rpJNxKEmZp0QIq4Gotb X-Received: by 2002:a05:6512:74:b0:4f9:710f:f3a9 with SMTP id i20-20020a056512007400b004f9710ff3a9mr2450586lfo.58.1689869570820; Thu, 20 Jul 2023 09:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689869570; cv=none; d=google.com; s=arc-20160816; b=Qd3ah6YMIZ7DeSzgLoi0N7AALnY/vqdCk0p6Y8LCaAskokpg7yukV7VqqeJL9Ct/Zv djABbE1Be5ofEi292H6OV2fy21rYzIWhQBRbiIjLpetH4Q5C7e8B3oypkDR1EPNbTewv 2iMk1VMJIp8mENQffIIwskH6JKEsflC0dIGLXmP9ag0VR4CPt7bHeITj+Zg46KlGsn4S Nv1DhinXoPkLMV/9mC6+8VC3NIkdbFAI/qp4L6K4d31Z7pzNhAQiKKQdfxdbsVyIDgN0 E4PGtDfmka+j+OLkew+Kl/oqJR8LIayq+2v2hRBQbUFa8PnMV3gjGCvlwdPKkZAxzHJj +RQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=RUxFS+LWIM3YhaUDAXCqrt+YL7/wWoooH1hTSPAwD8s=; fh=+8P4OKMP5ejBmReovhBcwwvyTtMA5EJ8xXZfNkN3zRo=; b=qfPg/losEc/gBuQFHWxIk8+7eAiHMthPAaieQVSLjaZqBoGHNjJsEXanAqQY7QLbuM PsQpeMX6vcECi453n8Wtr3lAMtg0BLIxgenr7DAT7bhsU39FBp+E1Fb8dzSyv8sTB+tq zJggVX2bCyrMuQE+c3NDtS7OPEgI9Qr9vSJbegahKu3pF8ragPnr+6Lz6qhslfB1CQfM OBtCjam5+VAmMuEtE6Ahp5smyv4FmccFCw+YvXdV0/qObKURu5cJq3zazeezIqY1CFH6 gC509ipVnRwVdKse4oEoakGiXsVZ9EGFxfTfrh055orjcad8k5a/7Q8HSXWnWqW48YiK VhdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b="R/n6PuMS"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t18-20020aa7d4d2000000b0051d882750d2si972326edr.569.2023.07.20.09.12.17; Thu, 20 Jul 2023 09:12:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b="R/n6PuMS"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233023AbjGTPyF (ORCPT + 99 others); Thu, 20 Jul 2023 11:54:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233016AbjGTPyC (ORCPT ); Thu, 20 Jul 2023 11:54:02 -0400 X-Greylist: delayed 600 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 20 Jul 2023 08:53:44 PDT Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81D631BF7; Thu, 20 Jul 2023 08:53:44 -0700 (PDT) Received: from localhost.localdomain (unknown [46.242.14.200]) by mail.ispras.ru (Postfix) with ESMTPSA id 083D540ADFF5; Thu, 20 Jul 2023 15:38:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 083D540ADFF5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1689867484; bh=RUxFS+LWIM3YhaUDAXCqrt+YL7/wWoooH1hTSPAwD8s=; h=From:To:Cc:Subject:Date:From; b=R/n6PuMS+c6RJI5IoOn0BJdygZ24lgzEt8xEeEar9gHB4DOAmdWTfpcX8PtoZyRzB I3J6N/BEHYk3Mjj6cVh12S+/3Hyt5n4ncqlYyU0lGQzX2dnv55XEOAsx5jow7EsPim lkaIjYJH7yb3XcVwigdneijLqy7Snx9Epoti/mjc= From: Fedor Pchelkin To: Trond Myklebust Cc: Fedor Pchelkin , Anna Schumaker , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org, stable@vger.kernel.org Subject: [PATCH] NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info Date: Thu, 20 Jul 2023 18:37:51 +0300 Message-ID: <20230720153753.20497-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org It is an almost improbable error case but when page allocating loop in nfs4_get_device_info() fails then we should only free the already allocated pages, as __free_page() can't deal with NULL arguments. Found by Linux Verification Center (linuxtesting.org). Cc: stable@vger.kernel.org Signed-off-by: Fedor Pchelkin --- fs/nfs/pnfs_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/pnfs_dev.c b/fs/nfs/pnfs_dev.c index ddbbf4fcda86..178001c90156 100644 --- a/fs/nfs/pnfs_dev.c +++ b/fs/nfs/pnfs_dev.c @@ -154,7 +154,7 @@ nfs4_get_device_info(struct nfs_server *server, set_bit(NFS_DEVICEID_NOCACHE, &d->flags); out_free_pages: - for (i = 0; i < max_pages; i++) + while (--i >= 0) __free_page(pages[i]); kfree(pages); out_free_pdev: -- 2.41.0