diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-08 12:59:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-08 12:59:45 -0500 |
commit | d3498fbaf386f9d540cdde7211ebb2d502b2b365 (patch) | |
tree | df7cf98c566236986b6cc6f3ca4b95ee14e858a6 | |
parent | 23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b (diff) | |
parent | 0c461cb727d146c9ef2d3e86214f498b78b7d125 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull selinux fix from James Morris:
"Fix off-by-one in setprocattr"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
selinux: fix off-by-one in setprocattr
-rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index c7c6619431d5..d98550abe16d 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -5887,7 +5887,7 @@ static int selinux_setprocattr(struct task_struct *p, | |||
5887 | return error; | 5887 | return error; |
5888 | 5888 | ||
5889 | /* Obtain a SID for the context, if one was specified. */ | 5889 | /* Obtain a SID for the context, if one was specified. */ |
5890 | if (size && str[1] && str[1] != '\n') { | 5890 | if (size && str[0] && str[0] != '\n') { |
5891 | if (str[size-1] == '\n') { | 5891 | if (str[size-1] == '\n') { |
5892 | str[size-1] = 0; | 5892 | str[size-1] = 0; |
5893 | size--; | 5893 | size--; |