From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5090434E4F; Tue, 21 Jul 2026 21:07:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668053; cv=none; b=Jl3O/h524WUFDK28p9iiYs6vgswnJfx6hNdzF2oQlXRdESjl9ERN1T4004DbVTxkgnVYAgGsmPop61b852wDJu28s0bB+cY0QeXY+4t8+Y5GsE+tHL/+1FuNaENo48h/LHZcPcjcQr3qSlaWa00bg2Ti2XH7LaR0jFVw15y37aA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668053; c=relaxed/simple; bh=h5GZxTB+W3hdHa6CqUHc+D9z3JyydXHvUxHU4m0GjH8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=INAUrbYsUVsPTZydMPAgrTI1Wky2XxgG0yNZoY7GtuYlEdIZ5bkRxrbArvppc+JQATwgeC04O0gSkGQaysaljnsUL5Ym1/O6bbpIBpXZH341s2M5rSqanTzEVs4gXYAD4BOEulywLINbrSVdj0CW1p4HlwvNdGdw9ctku+5W6yI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jRA4nU9c; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jRA4nU9c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 280371F00A3A; Tue, 21 Jul 2026 21:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784668052; bh=fIqsJgT2PmVQxjwmcOoGVbpEv3CT74tojyxhKh94yyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jRA4nU9c1VHLZkgZQw9OFtJPwHfJ9LIOB/DpYw+oXYENkFEYTktu5UnFkO+82DLTe WmXvs4G+TTSg5BGW66uZlk6P4Q968ZhMz3DtNCuK0Fw24TjVB2j0H6NHQ8Io3Up/0I 7HMNcfdYqWwgKPu5UVN05oyGRki5l8sBEcbhQys8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Bommarito , Anna Schumaker , Sasha Levin Subject: [PATCH 6.1 0030/1067] NFSv4/flexfiles: reject zero filehandle version count Date: Tue, 21 Jul 2026 17:10:31 +0200 Message-ID: <20260721152425.219985896@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Bommarito [ Upstream commit 2c6bb3c40bc24f6aa8dfbe6fe98c3ad6389203f2 ] ff_layout_alloc_lseg() decodes the filehandle-version array count from the flexfiles layout body. The value is used as the count for kzalloc_objs(), and the current code only rejects NULL. A zero count yields ZERO_SIZE_PTR, which can be stored in dss_info->fh_versions even though later flexfiles paths assume that at least one filehandle version exists. Reject fh_count == 0 before the allocation, matching the existing zero version_count validation in the flexfiles GETDEVICEINFO parser. A QEMU/KASAN run with a malformed flexfiles layout hit: KASAN: null-ptr-deref in range [0x0000000000000010-0x0000000000000017] RIP: 0010:ff_layout_encode_ff_layoutupdate.isra.0+0x15f/0x750 ff_layout_encode_layoutreturn+0x683/0x970 nfs4_xdr_enc_layoutreturn+0x278/0x3a0 Kernel panic - not syncing: Fatal exception The patched kernel rejects the malformed layout without KASAN/oops/panic, and a valid fh_count=1 regression still opens, reads, and unmounts cleanly. Cc: stable@vger.kernel.org Fixes: d67ae825a59d ("pnfs/flexfiles: Add the FlexFile Layout Driver") Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/nfs/flexfilelayout/flexfilelayout.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -460,6 +460,10 @@ ff_layout_alloc_lseg(struct pnfs_layout_ if (!p) goto out_err_free; fh_count = be32_to_cpup(p); + if (fh_count == 0) { + rc = -EINVAL; + goto out_err_free; + } fls->mirror_array[i]->fh_versions = kcalloc(fh_count, sizeof(struct nfs_fh),