Received: by 2002:a05:7412:da14:b0:e2:908c:2ebd with SMTP id fe20csp1521567rdb; Sun, 8 Oct 2023 11:34:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGw8WiI6aSvQhn5hQEmwOGOxe31csBQ3nYvJeBWTr2nzKeY3Ur8RBrnD1jB2wRzKy8vGhVg X-Received: by 2002:a05:6870:40c8:b0:1d6:4f15:8d7e with SMTP id l8-20020a05687040c800b001d64f158d7emr17229855oal.43.1696790099089; Sun, 08 Oct 2023 11:34:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696790099; cv=none; d=google.com; s=arc-20160816; b=CmUrTxniAsSKgTj71ug41jlZft4+R8wqoz4GzQZQPOhqHvzwL+Wm800w3e5EGP/1o8 u58PyhF+s3TtmUb0b0WFn5iBbG3QGootrcZmWuG2wU4y3LKSNtN6Az/o7bY9NlRr9Jam 46C8q9B3gJUwbI0qWtiPhSzx9L+HXtejQjKVv3aAL28+Hhe2Ak3v8AV0OEIL41z6V7n9 UE6wBgapaTdGrWRwvjJx+rcpoCu+ZJi0xTJlGyutQorHDsMF1fIVaiTOXfjyGVi8iuGf s5wlDvyGn9ubTsqdO1t4NpubRiVTeZkSM5jfM6vJXP6pC+oa+qLPK3XBiizv9PZW5BKw jT2w== 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:to:from:dkim-signature; bh=ecVGp3rSQ4610g5MVbJbsn9P0Ix5TN2bW5vm3BT7Eyw=; fh=Mys3y4MwsHRytUQMpdfGBn3oGRYLcLloxNwkFYMYMmg=; b=PHD7xzPSUy/4GGGnJjkwTclXcTjOaGsXYEnqH5GNcvOeQl5ebgS5C5DbejizrmmyvR 3HTS4A9Q5G6svAZ5Meae9vEA37sNnLIInNBwRwFZ6jg/+bKE/tLUfk6S9wx1TiUoy6Lt C6M3T25iygPr7/QoFX1ocP1BTUwZz9CmdzCer36H8qqjWD2eXjHKGeHNf6goNX6kIu5N D+blLA/u0I7RqhzgUHFmHsuYL7dN8e13FWkwoQvb92cl7+7LhkF2mBjJo9QX+dxs55dK x3TYVwJGnz/ecObgTCLBEhzTmGhZNzE9GsrIt2Xf07W1QNSm0bCsLLzLSgsRHoKg+usg UXIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="m54O/Ucw"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id c5-20020a6566c5000000b0056a8dc222f1si8575548pgw.259.2023.10.08.11.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 11:34:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="m54O/Ucw"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 9E0C88098FE4; Sun, 8 Oct 2023 11:34:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234255AbjJHSey (ORCPT + 99 others); Sun, 8 Oct 2023 14:34:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229945AbjJHSey (ORCPT ); Sun, 8 Oct 2023 14:34:54 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1050AAC for ; Sun, 8 Oct 2023 11:34:53 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5343CC433C7 for ; Sun, 8 Oct 2023 18:34:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696790092; bh=e5s6lPiViirl7bb4wkAEg4AUXr+EIm1guo3pPbQqMAc=; h=From:To:Subject:Date:From; b=m54O/UcwU7HpqekRKqh2Tvf+/Zdf9xwzrDv/Ym0CCYoNWQ2SCkpbaZ8U8no2OBbjZ 6ehriirzRsCRNuAr6PbSb4DSX8/FdXTmxK5H31qydBruTitZJsUmfNt12+GIHudurP JJ8Xj4++hdKokBFf8DyE9Fp+SZJfQva/G41VTKj5IL5hYgBPypelior6DArwKKmrXN jJXAquu7AGYQ5IgDqF2ogIKNyVWhQl8XQfFQpPsz0/yJR68eq2/RK5RI7J5BCGjwC+ 5Tw9c8kYt7MdK5/G8MCwWbwYuTLhYvOVQ7djSU/epdtbv/imG5XpJL1gQYumDrYTF6 T3cYz65V0VVTw== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH] pNFS/flexfiles: Check the layout validity in ff_layout_mirror_prepare_stats Date: Sun, 8 Oct 2023 14:28:46 -0400 Message-ID: <20231008182846.12956-1-trondmy@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 08 Oct 2023 11:34:55 -0700 (PDT) X-Spam-Level: ** From: Trond Myklebust Ensure that we check the layout pointer and validity after dereferencing it in ff_layout_mirror_prepare_stats. Fixes: 08e2e5bc6c9a ("pNFS/flexfiles: Clean up layoutstats") Signed-off-by: Trond Myklebust --- fs/nfs/flexfilelayout/flexfilelayout.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index a1dc33864906..ef817a0475ff 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -2520,9 +2520,9 @@ ff_layout_mirror_prepare_stats(struct pnfs_layout_hdr *lo, return i; } -static int -ff_layout_prepare_layoutstats(struct nfs42_layoutstat_args *args) +static int ff_layout_prepare_layoutstats(struct nfs42_layoutstat_args *args) { + struct pnfs_layout_hdr *lo; struct nfs4_flexfile_layout *ff_layout; const int dev_count = PNFS_LAYOUTSTATS_MAXDEV; @@ -2533,11 +2533,14 @@ ff_layout_prepare_layoutstats(struct nfs42_layoutstat_args *args) return -ENOMEM; spin_lock(&args->inode->i_lock); - ff_layout = FF_LAYOUT_FROM_HDR(NFS_I(args->inode)->layout); - args->num_dev = ff_layout_mirror_prepare_stats(&ff_layout->generic_hdr, - &args->devinfo[0], - dev_count, - NFS4_FF_OP_LAYOUTSTATS); + lo = NFS_I(args->inode)->layout; + if (lo && pnfs_layout_is_valid(lo)) { + ff_layout = FF_LAYOUT_FROM_HDR(lo); + args->num_dev = ff_layout_mirror_prepare_stats( + &ff_layout->generic_hdr, &args->devinfo[0], dev_count, + NFS4_FF_OP_LAYOUTSTATS); + } else + args->num_dev = 0; spin_unlock(&args->inode->i_lock); if (!args->num_dev) { kfree(args->devinfo); -- 2.41.0