diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-30 16:35:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-30 16:35:45 -0700 |
| commit | 39e16d93424b61e0b5bd182e308a56d5f0e489d6 (patch) | |
| tree | 83e8c685b430aa1c30db374b62c5f0ddacd378b2 /security/selinux/ss | |
| parent | 0468915bdb7cd3160c892664a53ce320e254281e (diff) | |
| parent | fb73974172ffaaf57a7c42f35424d9aece1a5af6 (diff) | |
| download | linux-39e16d93424b61e0b5bd182e308a56d5f0e489d6.tar.gz linux-39e16d93424b61e0b5bd182e308a56d5f0e489d6.tar.bz2 linux-39e16d93424b61e0b5bd182e308a56d5f0e489d6.zip | |
Merge tag 'selinux-pr-20200430' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Pull SELinux fixes from Paul Moore:
"Two more SELinux patches to fix problems in the v5.7-rcX releases.
Wei Yongjun's patch fixes a return code in an error path, and my patch
fixes a problem where we were not correctly applying access controls
to all of the netlink messages in the netlink_send LSM hook"
* tag 'selinux-pr-20200430' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
selinux: properly handle multiple messages in selinux_netlink_send()
selinux: fix error return code in cond_read_list()
Diffstat (limited to 'security/selinux/ss')
| -rw-r--r-- | security/selinux/ss/conditional.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index 939a74fd8fb4..da94a1b4bfda 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -429,7 +429,7 @@ int cond_read_list(struct policydb *p, void *fp) p->cond_list = kcalloc(len, sizeof(*p->cond_list), GFP_KERNEL); if (!p->cond_list) - return rc; + return -ENOMEM; rc = avtab_alloc(&(p->te_cond_avtab), p->te_avtab.nel); if (rc) |