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 6513632FA1B for ; Wed, 15 Apr 2026 09:16:56 +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=1776244616; cv=none; b=d45q2/v9BZZCSG7CjrEZmIYttUuBAmqITgNEMOztWXGqygJcyvFC6ZCMT3mx5wcN2zmlrWDRUi4tG9I5qqjmtSxBxiMV9Ovc6K+0S6iXrYHe5bOBd13LtBp5Gj2w/pFORDgWdZ4zy+UaUcshJNQpBwD4iZd07tycDBh4ge/e7EM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776244616; c=relaxed/simple; bh=9kt0l6/wNxYfxltTDUKBvGUuF1lv6hnreURDOpdd3zo=; h=Date:To:From:Subject:Message-Id; b=ZTzsyteXIzR3p5VeyII2GSFlVNMyV74xIEhxDpCS/F6j/2m6fUmupSpFA6LnvTRmnBg5jHMV50rkoCQPlyB8L5oZBvjkeu6fugUejgKjOEYq+TYQPusWLIKxmCKG+8+HYdNVuWkuO3KGkuGmYsFYUmp3/BeRf5K5sWLfDacs0HQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=NczhnaP4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="NczhnaP4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74ADEC19424; Wed, 15 Apr 2026 09:16:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1776244616; bh=9kt0l6/wNxYfxltTDUKBvGUuF1lv6hnreURDOpdd3zo=; h=Date:To:From:Subject:From; b=NczhnaP4FJm5piV1EcolhoWWD9hunEKK2MHlk9ytBYVTfLhuZY+GAW9aYlmWYyHnU LfLhGCugENHrDCdfEeQXrEYonyWXiv8KxvC/RGMJJvDt8JUFrMPMnDvXwllCO5ibBF vTAznZxhitsvxRUG7Dmzx45NuS+DfaYkjvMh55ho= Date: Wed, 15 Apr 2026 02:16:51 -0700 To: mm-commits@vger.kernel.org,piaojun@huawei.com,mark@fasheh.com,junxiao.bi@oracle.com,joseph.qi@linux.alibaba.com,jlbec@evilplan.org,heming.zhao@suse.com,gechangwei@live.cn,gality369@gmail.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] ocfs2-fix-listxattr-handling-when-the-buffer-is-full.patch removed from -mm tree Message-Id: <20260415091655.74ADEC19424@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: ocfs2: fix listxattr handling when the buffer is full has been removed from the -mm tree. Its filename was ocfs2-fix-listxattr-handling-when-the-buffer-is-full.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: ZhengYuan Huang Subject: ocfs2: fix listxattr handling when the buffer is full Date: Fri, 10 Apr 2026 12:03:39 +0800 [BUG] If an OCFS2 inode has both inline and block-based xattrs, listxattr() can return a size larger than the caller's buffer when the inline names consume that buffer exactly. kernel BUG at mm/usercopy.c:102! Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:usercopy_abort+0xb7/0xd0 mm/usercopy.c:102 Call Trace: __check_heap_object+0xe3/0x120 mm/slub.c:8243 check_heap_object mm/usercopy.c:196 [inline] __check_object_size mm/usercopy.c:250 [inline] __check_object_size+0x5c5/0x780 mm/usercopy.c:215 check_object_size include/linux/ucopysize.h:22 [inline] check_copy_size include/linux/ucopysize.h:59 [inline] copy_to_user include/linux/uaccess.h:219 [inline] listxattr+0xb0/0x170 fs/xattr.c:926 filename_listxattr fs/xattr.c:958 [inline] path_listxattrat+0x137/0x320 fs/xattr.c:988 __do_sys_listxattr fs/xattr.c:1001 [inline] __se_sys_listxattr fs/xattr.c:998 [inline] __x64_sys_listxattr+0x7f/0xd0 fs/xattr.c:998 ... [CAUSE] Commit 936b8834366e ("ocfs2: Refactor xattr list and remove ocfs2_xattr_handler().") replaced the old per-handler list accounting with ocfs2_xattr_list_entry(), but it kept using size == 0 to detect probe mode. That assumption stops being true once ocfs2_listxattr() finishes the inline-xattr pass. If the inline names fill the caller buffer exactly, the block-xattr pass runs with a non-NULL buffer and a remaining size of zero. ocfs2_xattr_list_entry() then skips the bounds check, keeps counting block names, and returns a positive size larger than the supplied buffer. [FIX] Detect probe mode by testing whether the destination buffer pointer is NULL instead of whether the remaining size is zero. That restores the pre-refactor behavior and matches the OCFS2 getxattr helpers. Once the remaining buffer reaches zero while more names are left, the block-xattr pass now returns -ERANGE instead of reporting a size larger than the allocated list buffer. Link: https://lkml.kernel.org/r/20260410040339.3837162-1-gality369@gmail.com Fixes: 936b8834366e ("ocfs2: Refactor xattr list and remove ocfs2_xattr_handler().") Signed-off-by: ZhengYuan Huang Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Cc: Heming Zhao Signed-off-by: Andrew Morton --- fs/ocfs2/xattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/ocfs2/xattr.c~ocfs2-fix-listxattr-handling-when-the-buffer-is-full +++ a/fs/ocfs2/xattr.c @@ -911,8 +911,8 @@ static int ocfs2_xattr_list_entry(struct total_len = prefix_len + name_len + 1; *result += total_len; - /* we are just looking for how big our buffer needs to be */ - if (!size) + /* No buffer means we are only looking for the required size. */ + if (!buffer) return 0; if (*result > size) _ Patches currently in -mm which might be from gality369@gmail.com are