From: Utkal Singh <singhutkal015@gmail.com>
To: linux-erofs@lists.ozlabs.org
Cc: xiang@kernel.org, yifan.yfzhao@linux.dev,
linux-kernel@vger.kernel.org, singhutkal015@gmail.com
Subject: [PATCH v3] erofs: validate h_shared_count in erofs_init_inode_xattrs()
Date: Tue, 17 Mar 2026 16:41:35 +0000 [thread overview]
Message-ID: <20260317164135.24892-1-singhutkal015@gmail.com> (raw)
In-Reply-To: <20260317152439.5738-1-singhutkal015@gmail.com>
A crafted image can set h_shared_count to a value much larger than
what xattr_isize allows. The loop in erofs_init_inode_xattrs() then
reads shared xattr IDs far beyond the inode's xattr region, causing
an out-of-bounds metadata read.
Add a sanity check ensuring:
h_shared_count <= (xattr_isize - sizeof(erofs_xattr_ibody_header)) / 4
Return -EFSCORRUPTED when the check fails.
Signed-off-by: Utkal Singh <singhutkal015@gmail.com>
---
v3:
- use local variable sb instead of inode->i_sb in erofs_err()
to match existing code style in erofs_init_inode_xattrs()
- confirmed compile-tested with make fs/erofs/xattr.o
v2:
- initial patch with bounds check against xattr_isize
fs/erofs/xattr.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c
index c411df5d9dfc..af16cf634a01 100644
--- a/fs/erofs/xattr.c
+++ b/fs/erofs/xattr.c
@@ -85,6 +85,15 @@ static int erofs_init_inode_xattrs(struct inode *inode)
}
vi->xattr_name_filter = le32_to_cpu(ih->h_name_filter);
vi->xattr_shared_count = ih->h_shared_count;
+ if (vi->xattr_shared_count >
+ (vi->xattr_isize - sizeof(struct erofs_xattr_ibody_header)) /
+ sizeof(__le32)) {
+ erofs_err(sb,
+ "bogus h_shared_count %u for nid %llu",
+ vi->xattr_shared_count, vi->nid);
+ ret = -EFSCORRUPTED;
+ goto out_unlock;
+ }
vi->xattr_shared_xattrs = kmalloc_objs(uint, vi->xattr_shared_count);
if (!vi->xattr_shared_xattrs) {
erofs_put_metabuf(&buf);
--
2.43.0
next prev parent reply other threads:[~2026-03-17 16:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-17 15:24 [PATCH v2] erofs: harden h_shared_count in erofs_init_inode_xattrs() Utkal Singh
2026-03-17 16:10 ` Gao Xiang
2026-03-17 16:41 ` Utkal Singh [this message]
2026-03-17 16:48 ` [PATCH v3] erofs: validate " Gao Xiang
2026-03-17 16:53 ` Gao Xiang
2026-03-17 16:59 ` Utkal Singh
2026-03-17 17:07 ` Gao Xiang
2026-03-18 6:08 ` [PATCH v2] erofs: harden " Chao Yu
2026-03-18 7:39 ` Utkal Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260317164135.24892-1-singhutkal015@gmail.com \
--to=singhutkal015@gmail.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xiang@kernel.org \
--cc=yifan.yfzhao@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox