summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorChen Zhou <chenzhou10@huawei.com>2020-11-12 21:53:32 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-18 19:22:28 +0100
commit23f880dc21bdfc20b50b967cef03dabd873329c2 (patch)
tree4cd3a7d89b7fc306cc90a009d27fad105ae70641 /security
parent800c1e71804ba115dd77454692b963a3b1d8bf6f (diff)
downloadlinux-stable-23f880dc21bdfc20b50b967cef03dabd873329c2.tar.gz
linux-stable-23f880dc21bdfc20b50b967cef03dabd873329c2.tar.bz2
linux-stable-23f880dc21bdfc20b50b967cef03dabd873329c2.zip
selinux: Fix error return code in sel_ib_pkey_sid_slow()
commit c350f8bea271782e2733419bd2ab9bf4ec2051ef upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
-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;