Commit d3498fba authored by Linus Torvalds's avatar Linus Torvalds

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
parents 23fbe2cd 0c461cb7
...@@ -5887,7 +5887,7 @@ static int selinux_setprocattr(struct task_struct *p, ...@@ -5887,7 +5887,7 @@ static int selinux_setprocattr(struct task_struct *p,
return error; return error;
/* Obtain a SID for the context, if one was specified. */ /* Obtain a SID for the context, if one was specified. */
if (size && str[1] && str[1] != '\n') { if (size && str[0] && str[0] != '\n') {
if (str[size-1] == '\n') { if (str[size-1] == '\n') {
str[size-1] = 0; str[size-1] = 0;
size--; size--;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment