Skip to contentSkip to conversation

selinux: Fix error return code in sel_ib_pkey_sid_slow()

PATCH Superseded Chen Zhou 1 participant 2 messages Nov 12, 2020 SELinux security module

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Chen Zhou

author
#0 lore raw

PATCH 1/1 selinux: Fix error return code in sel_ib_pkey_sid_slow()

Fix to return a negative error code from the error handling case instead of 0 in function sel_ib_pkey_sid_slow(), as done elsewhere in this function.

Fixes 409dcf31538a ("selinux: Add a cache for quicker retreival of PKey SIDs")
---
 security/selinux/ibpkey.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
security/selinux/ibpkey.c +3 -1
index f68a7617cfb9..680b2dd1520f 100644
@@ -151,8 +151,10 @@ static int sel_ib_pkey_sid_slow(u64 subnet_prefix, u16 pkey_num, u32 *sid)
 	 * is valid, it just won't be added to the cache.
 	 */
 	new = kzalloc(sizeof(*new), GFP_ATOMIC);
-	if (!new)
+	if (IS_ERR(new)) {
+		ret = PTR_ERR(new);
 		goto out;
+	}
 
 	new->psec.subnet_prefix = subnet_prefix;
 	new->psec.pkey = pkey_num;
Signature · 1 line
2.20.1
author
#1 lore raw
Quoted 17 lines · Chen Zhou

Fix to return a negative error code from the error handling case instead of 0 in function sel_ib_pkey_sid_slow(), as done elsewhere in this function.

Fixes 409dcf31538a ("selinux: Add a cache for quicker retreival of PKey SIDs")
---
 security/selinux/ibpkey.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
security/selinux/ibpkey.c +0 -0
index f68a7617cfb9..680b2dd1520f 100644
@@ -151,8 +151,10 @@ static int sel_ib_pkey_sid_slow(u64 subnet_prefix, u16 pkey_num, u32 *sid)
 	 * is valid, it just won't be added to the cache.

security/selinux/ibpkey.c static int sel_ib_pkey_sid_slow(u64 subnet_prefix, u16 pkey_num, u32 *sid) · line 160

Quoted 10 lines
security/selinux/ibpkey.c +3 -1
 	 */
 	new = kzalloc(sizeof(*new), GFP_ATOMIC);
-	if (!new)
+	if (IS_ERR(new)) {
+		ret = PTR_ERR(new);
 		goto out;
+	}
 
 	new->psec.subnet_prefix = subnet_prefix;
 	new->psec.pkey = pkey_num;

Ignore this, will send v2.