summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Zhou <chenzhou10@huawei.com>2020-11-12 21:53:32 +0800
committerPaul Moore <paul@paul-moore.com>2020-11-12 20:16:09 -0500
commitc350f8bea271782e2733419bd2ab9bf4ec2051ef (patch)
treef37458c8f6e71203104cea14826491c73a059154
parent0d50f059c4cdc9e436f6f4db8779ac0795bfdadf (diff)
downloadlinux-c350f8bea271782e2733419bd2ab9bf4ec2051ef.tar.gz
linux-c350f8bea271782e2733419bd2ab9bf4ec2051ef.tar.bz2
linux-c350f8bea271782e2733419bd2ab9bf4ec2051ef.zip
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. Cc: stable@vger.kernel.org Fixes: 409dcf31538a ("selinux: Add a cache for quicker retreival of PKey SIDs") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Chen Zhou <chenzhou10@huawei.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
-rw-r--r--security/selinux/ibpkey.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/ibpkey.c b/security/selinux/ibpkey.c
index f68a7617cfb9..3a63a989e55e 100644
--- a/security/selinux/ibpkey.c
+++ b/security/selinux/ibpkey.c
@@ -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 (!new) {
+ ret = -ENOMEM;
goto out;
+ }
new->psec.subnet_prefix = subnet_prefix;
new->psec.pkey = pkey_num;