diff options
| author | Artem Sadovnikov <ancowi69@gmail.com> | 2024-10-05 10:06:57 +0000 |
|---|---|---|
| committer | Dave Kleikamp <dave.kleikamp@oracle.com> | 2024-10-29 17:17:43 -0500 |
| commit | d9f9d96136cba8fedd647d2c024342ce090133c2 (patch) | |
| tree | 2693d52666d610492967eb388ef744579ad5c524 | |
| parent | 839f102efb168f02dfdd46717b7c6dddb26b015e (diff) | |
| download | lwn-d9f9d96136cba8fedd647d2c024342ce090133c2.tar.gz lwn-d9f9d96136cba8fedd647d2c024342ce090133c2.zip | |
jfs: xattr: check invalid xattr size more strictly
Commit 7c55b78818cf ("jfs: xattr: fix buffer overflow for invalid xattr")
also addresses this issue but it only fixes it for positive values, while
ea_size is an integer type and can take negative values, e.g. in case of
a corrupted filesystem. This still breaks validation and would overflow
because of implicit conversion from int to size_t in print_hex_dump().
Fix this issue by clamping the ea_size value instead.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
Cc: stable@vger.kernel.org
Signed-off-by: Artem Sadovnikov <ancowi69@gmail.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
| -rw-r--r-- | fs/jfs/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c index 0fb05e314edf..24afbae87225 100644 --- a/fs/jfs/xattr.c +++ b/fs/jfs/xattr.c @@ -559,7 +559,7 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size) size_check: if (EALIST_SIZE(ea_buf->xattr) != ea_size) { - int size = min_t(int, EALIST_SIZE(ea_buf->xattr), ea_size); + int size = clamp_t(int, ea_size, 0, EALIST_SIZE(ea_buf->xattr)); printk(KERN_ERR "ea_get: invalid extended attribute\n"); print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1, |