From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 DC0BE6BB5B; Tue, 12 Aug 2025 18:55:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755024902; cv=none; b=KJ9jcJ/9+r8RMZL+w9qmFb6sIFYZsYRfuhsivy+Zpd+l9Zt8BS3hGChtpH65j8JwjxLvZS3TTnbJbeplDH+FbWomaKAidRZcigfHoHH/LfMT+I6P18Ei35N15r5SHPJhN1/0jsvIgEXhoJNKHbmFZayONGTPxi2XIk+CA4vyknE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755024902; c=relaxed/simple; bh=KNm6BadJ5dYjQJ9wZp6KvWfWrbC/yiGlBTvW7Asb9FA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eLJTs7JNgexnA9I4h61IlfWXD8duLzQVJb6LGsYTUv3AvvbBXF7Wkzic9dHFFa8rLE4WZP9ZTXulMVMGT9YtvLtPvahYScdFB4/vK971x4fTcK072H+/PYLWC4rCBR7pozoXP8dGq2mk3Ptaa29rESXOZ6aBQtkN/prfoI4kvng= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Jcmqggsp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Jcmqggsp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CA51C4CEF0; Tue, 12 Aug 2025 18:55:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755024902; bh=KNm6BadJ5dYjQJ9wZp6KvWfWrbC/yiGlBTvW7Asb9FA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JcmqggspF2JKlpounT4XpCn1Pq0DVhQ8ygbJA0g0cZjvAbBQHT+6eQRT53s92CtT2 hxFqNLbafGv0jAD8zWWbGvXBr/XIxXYyR2xf9MwHsoge/jrt89FQMq6HnOlb5dTFRv aCAdIOc4dA5s8DsvSVpv7jhK5lcINLxrMu++OIzE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, zhangjian , Trond Myklebust , Sasha Levin Subject: [PATCH 6.16 510/627] NFS: Fix filehandle bounds checking in nfs_fh_to_dentry() Date: Tue, 12 Aug 2025 19:33:25 +0200 Message-ID: <20250812173449.033533215@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812173419.303046420@linuxfoundation.org> References: <20250812173419.303046420@linuxfoundation.org> User-Agent: quilt/0.68 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.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Trond Myklebust [ Upstream commit ef93a685e01a281b5e2a25ce4e3428cf9371a205 ] The function needs to check the minimal filehandle length before it can access the embedded filehandle. Reported-by: zhangjian Fixes: 20fa19027286 ("nfs: add export operations") Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/export.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/nfs/export.c b/fs/nfs/export.c index e9c233b6fd20..a10dd5f9d078 100644 --- a/fs/nfs/export.c +++ b/fs/nfs/export.c @@ -66,14 +66,21 @@ nfs_fh_to_dentry(struct super_block *sb, struct fid *fid, { struct nfs_fattr *fattr = NULL; struct nfs_fh *server_fh = nfs_exp_embedfh(fid->raw); - size_t fh_size = offsetof(struct nfs_fh, data) + server_fh->size; + size_t fh_size = offsetof(struct nfs_fh, data); const struct nfs_rpc_ops *rpc_ops; struct dentry *dentry; struct inode *inode; - int len = EMBED_FH_OFF + XDR_QUADLEN(fh_size); + int len = EMBED_FH_OFF; u32 *p = fid->raw; int ret; + /* Initial check of bounds */ + if (fh_len < len + XDR_QUADLEN(fh_size) || + fh_len > XDR_QUADLEN(NFS_MAXFHSIZE)) + return NULL; + /* Calculate embedded filehandle size */ + fh_size += server_fh->size; + len += XDR_QUADLEN(fh_size); /* NULL translates to ESTALE */ if (fh_len < len || fh_type != len) return NULL; -- 2.39.5