This is a note to let you know that I've just added the patch titled revert "squashfs: harden sanity check in squashfs_read_xattr_id_table" to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-squashfs-harden-sanity-check-in-squashfs_read_xattr_id_table.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a5b21d8d791cd4db609d0bbcaa9e0c7e019888d1 Mon Sep 17 00:00:00 2001 From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Date: Thu, 2 Feb 2023 18:07:35 -0800 Subject: revert "squashfs: harden sanity check in squashfs_read_xattr_id_table" From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> commit a5b21d8d791cd4db609d0bbcaa9e0c7e019888d1 upstream. This fix was nacked by Philip, for reasons identified in the email linked below. Link: https://lkml.kernel.org/r/68f15d67-8945-2728-1f17-5b53a80ec52d@xxxxxxxxxxxxxxx Fixes: 72e544b1b28325 ("squashfs: harden sanity check in squashfs_read_xattr_id_table") Cc: Alexey Khoroshilov <khoroshilov@xxxxxxxxx> Cc: Fedor Pchelkin <pchelkin@xxxxxxxxx> Cc: Phillip Lougher <phillip@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/squashfs/xattr_id.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/squashfs/xattr_id.c +++ b/fs/squashfs/xattr_id.c @@ -76,7 +76,7 @@ __le64 *squashfs_read_xattr_id_table(str /* Sanity check values */ /* there is always at least one xattr id */ - if (*xattr_ids <= 0) + if (*xattr_ids == 0) return ERR_PTR(-EINVAL); len = SQUASHFS_XATTR_BLOCK_BYTES(*xattr_ids); Patches currently in stable-queue which might be from akpm@xxxxxxxxxxxxxxxxxxxx are queue-6.1/mm-filemap-fix-page-end-in-filemap_get_read_batch.patch queue-6.1/nilfs2-fix-underflow-in-second-superblock-position-calculations.patch queue-6.1/mm-shrinkers-fix-deadlock-in-shrinker-debugfs.patch queue-6.1/hugetlb-check-for-undefined-shift-on-32-bit-architectures.patch queue-6.1/aio-fix-mremap-after-fork-null-deref.patch queue-6.1/revert-squashfs-harden-sanity-check-in-squashfs_read_xattr_id_table.patch queue-6.1/kasan-fix-oops-due-to-missing-calls-to-kasan_arch_is_ready.patch queue-6.1/mm-migrate-fix-wrongly-apply-write-bit-after-mkdirty-on-sparc64.patch queue-6.1/mm-madv_collapse-set-eagain-on-unexpected-page-refcount.patch queue-6.1/of-reserved_mem-have-kmemleak-ignore-dynamically-allocated-reserved-mem.patch