Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: Fix regression for Xorg
  • Loading branch information
Linus Torvalds committed Mar 29, 2011
2 parents b5b4bc3 + 85cd6da commit 7de8e57
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/selinux/ss/services.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static u16 map_class(u16 pol_value)
return i;
}

return pol_value;
return SECCLASS_NULL;
}

static void map_decision(u16 tclass, struct av_decision *avd,
Expand Down

0 comments on commit 7de8e57

Please sign in to comment.