diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-10 10:05:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-10 10:05:36 -0700 |
| commit | fad0701eaa091beb8ce5ef2eef04b5e833617368 (patch) | |
| tree | 788297c7b05b167599265013ef8ec473a0d367fe /security/selinux/include/xfrm.h | |
| parent | Merge tag 'upstream-3.16-rc1-v2' of git://git.infradead.org/linux-ubifs (diff) | |
| parent | ima: audit log files opened with O_DIRECT flag (diff) | |
| download | linux-dev-fad0701eaa091beb8ce5ef2eef04b5e833617368.tar.xz linux-dev-fad0701eaa091beb8ce5ef2eef04b5e833617368.zip | |
Merge branch 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security
Pull security layer updates from Serge Hallyn:
"This is a merge of James Morris' security-next tree from 3.14 to
yesterday's master, plus four patches from Paul Moore which are in
linux-next, plus one patch from Mimi"
* 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security:
ima: audit log files opened with O_DIRECT flag
selinux: conditionally reschedule in hashtab_insert while loading selinux policy
selinux: conditionally reschedule in mls_convert_context while loading selinux policy
selinux: reject setexeccon() on MNT_NOSUID applications with -EACCES
selinux: Report permissive mode in avc: denied messages.
Warning in scanf string typing
Smack: Label cgroup files for systemd
Smack: Verify read access on file open - v3
security: Convert use of typedef ctl_table to struct ctl_table
Smack: bidirectional UDS connect check
Smack: Correctly remove SMACK64TRANSMUTE attribute
SMACK: Fix handling value==NULL in post setxattr
bugfix patch for SMACK
Smack: adds smackfs/ptrace interface
Smack: unify all ptrace accesses in the smack
Smack: fix the subject/object order in smack_ptrace_traceme()
Minor improvement of 'smack_sb_kern_mount'
smack: fix key permission verification
KEYS: Move the flags representing required permission to linux/key.h
Diffstat (limited to 'security/selinux/include/xfrm.h')
0 files changed, 0 insertions, 0 deletions