Skip to contentSkip to conversation

selinux: Handle NULL return from selinux_inode in inode_security_rcu

PATCH In review Ingyu Jang 2 participants 2 messages Jan 16, 2025 SELinux security module

lore
Share & tools
lore

Ingyu Jang

author
#0 lore raw

PATCH 1/1 selinux: Handle NULL return from selinux_inode in inode_security_rcu

The 'selinux_inode' function may return NULL if 'inode->i_security' is uninitialized or if 'inode->i_security' is NULL. Previously, this scenario was not explicitly handled in 'inode_security_rcu', which might lead to NULL Pointer dereference.

This patch modifies 'inode_security_rcu' to call 'selinux_inode' and check its return value.
If 'selinux_inode' returns NULL, '-EACCES' is returned to ensure consistent error handling.

Furthermore, analysis confirmed that all current usages of 'inode_security_rcu' check the return value using 'IS_ERR', ensuring compatibility with this change.

---
 security/selinux/hooks.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
security/selinux/hooks.c +7 -1
index 171dd7fceac5..61c9191bafbe 100644
@@ -310,11 +310,17 @@ static struct inode_security_struct *inode_security_novalidate(struct inode *ino
 static struct inode_security_struct *inode_security_rcu(struct inode *inode, bool rcu)
 {
 	int error;
+	struct inode_security_struct *isec;
 
 	error = __inode_security_revalidate(inode, NULL, !rcu);
 	if (error)
 		return ERR_PTR(error);
-	return selinux_inode(inode);
+
+	isec = selinux_inode(inode);
+	if (!isec)
+		return ERR_PTR(-EACCES);
+
+	return isec;
 }
 
 /*
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 11 lines · Ingyu Jang

The 'selinux_inode' function may return NULL if 'inode->i_security' is uninitialized or if 'inode->i_security' is NULL. Previously, this scenario was not explicitly handled in 'inode_security_rcu', which might lead to NULL Pointer dereference.

This patch modifies 'inode_security_rcu' to call 'selinux_inode' and check its return value.
If 'selinux_inode' returns NULL, '-EACCES' is returned to ensure consistent error handling.

Quoted 5 lines

Furthermore, analysis confirmed that all current usages of 'inode_security_rcu' check the return value using 'IS_ERR', ensuring compatibility with this change.

Do you have an actual example where this is currently possible if SELinux is enabled?
It shouldn't be possible, so that would be a kernel bug that should be fixed.

Quoted 30 lines
---
 security/selinux/hooks.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
security/selinux/hooks.c +7 -2
index 171dd7fceac5..61c9191bafbe 100644
@@ -310,11 +310,17 @@ static struct inode_security_struct *inode_security_novalidate(struct inode *ino
 static struct inode_security_struct *inode_security_rcu(struct inode *inode, bool rcu)
 {
        int error;
+       struct inode_security_struct *isec;
 
        error = __inode_security_revalidate(inode, NULL, !rcu);
        if (error)
                return ERR_PTR(error);
-       return selinux_inode(inode);
+
+       isec = selinux_inode(inode);
+       if (!isec)
+               return ERR_PTR(-EACCES);
+
+       return isec;
 }
 
 /*
--

2.34.1