2020-11-12 13:50:43

by chenzhou

Subject: [PATCH v2] 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")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Chen Zhou <[email protected]>
---
security/selinux/ibpkey.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

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;
--
2.20.1

2020-11-13 01:21:43

by Paul Moore

Subject: Re: [PATCH v2] selinux: Fix error return code in sel_ib_pkey_sid_slow()

On Thu, Nov 12, 2020 at 8:48 AM Chen Zhou <[email protected]> wrote:
>
> 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")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Chen Zhou <[email protected]>
> ---
> security/selinux/ibpkey.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)

Thanks for the fix! I've merged this into the selinux/stable-5.10
branch and I'll send this up to Linus tomorrow or early next week.

--
paul moore
http://www.paul-moore.com