selinux: don't reserve xattr slot when we won't fill it
Subsystems (2)
PATCH 1/1 selinux: don't reserve xattr slot when we won't fill it
Move lsm_get_xattr_slot() below the SBLABEL_MNT check so we don't leave a NULL-named slot in the array when returning -EOPNOTSUPP; filesystem initxattrs() callbacks stop iterating at the first NULL ->name, silently dropping xattrs installed by later LSMs.
--- security/selinux/hooks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
security/selinux/hooks.c +2 -1
@@ -2966,7 +2966,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, {const struct cred_security_struct *crsec =selinux_cred (current_cred ());struct superblock_security_struct *sbsec; -struct xattr *xattr =lsm_get_xattr_slot (xattrs, xattr_count); +struct xattr *xattr;u32 newsid, clen;u16 newsclass;int rc;
@@ -2992,6 +2992,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, !(sbsec->flags & SBLABEL_MNT))return -EOPNOTSUPP ; + xattr =lsm_get_xattr_slot (xattrs, xattr_count);if (xattr) { rc =security_sid_to_context_force (newsid, &context, &clen);
base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731
Signature · 1 line
2.53.0
Paul Moore
maintainerQuoted 10 lines · On Apr 26, 2026 David Windsor <[email protected]> wrote:
Move
lsm_get_xattr_slot()below theSBLABEL_MNTcheck so we don't leave a NULL-named slot in the array when returning-EOPNOTSUPP; filesysteminitxattrs()callbacks stop iterating at the first NULL ->name, silently dropping xattrs installed by later LSMs.Signed-off-by David Windsor <[email protected]>--- security/selinux/hooks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Good catch, thanks. These seems like a stable candidate so I've merged it into selinux/stable-7.1 and we likely send it up to Linus later this week.
Quoted 22 lines
security/selinux/hooks.c +2
-1@@ -2966,7 +2966,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, {const struct cred_security_struct *crsec =selinux_cred (current_cred ());struct superblock_security_struct *sbsec; -struct xattr *xattr =lsm_get_xattr_slot (xattrs, xattr_count); +struct xattr *xattr;u32 newsid, clen;u16 newsclass;int rc;@@ -2992,6 +2992,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, !(sbsec->flags & SBLABEL_MNT))return -EOPNOTSUPP ; + xattr =lsm_get_xattr_slot (xattrs, xattr_count);if (xattr) { rc =security_sid_to_context_force (newsid, &context, &clen);
Quoted 3 lines
base-commit:
254f49634ee16a731174d2ae34bc50bd5f45e731Signature · 1 line
2.53.0
--
paul-moore.com