Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  SELinux: skip file_name_trans_write() when policy downgraded.
  selinux: fix case of names with whitespace/multibytes on /selinux/create

...

This commit is contained in:

Linus Torvalds 2011-06-16 09:44:20 -07:00

parent e1d76719ea 82b88bb24e

commit df9d030c13

2 changed files with 39 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

37

security/selinux/selinuxfs.c

View file

3

security/selinux/ss/policydb.c

View file