Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'selinux-pr-20181115' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Pull SELinux fixes from Paul Moore:
"Two small SELinux fixes for v4.20.
Ondrej's patch adds a check on user input, and my patch ensures we
don't look past the end of a buffer.
Both patches are quite small and pass the selinux-testsuite"
* tag 'selinux-pr-20181115' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
selinux: fix non-MLS handling in mls_context_to_sid()
selinux: check length properly in SCTP bind hook
+10
-3
+3
security/selinux/hooks.c
+3
security/selinux/hooks.c
+7
-3
security/selinux/ss/mls.c
+7
-3
security/selinux/ss/mls.c
···
245
245
char *rangep[2];
246
246
247
247
if (!pol->mls_enabled) {
248
-
if ((def_sid != SECSID_NULL && oldc) || (*scontext) == '\0')
249
-
return 0;
250
-
return -EINVAL;
248
+
/*
249
+
* With no MLS, only return -EINVAL if there is a MLS field
250
+
* and it did not come from an xattr.
251
+
*/
252
+
if (oldc && def_sid == SECSID_NULL)
253
+
return -EINVAL;
254
+
return 0;
251
255
}
252
256
253
257
/*