summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* ima: do not update security.ima if appraisal status is not INTEGRITY_PASSRoberto Sassu2017-11-201-0/+3
* Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-11-151-8/+8
|\
| * treewide: Fix function prototypes for module_param_call()Kees Cook2017-10-311-8/+8
* | Merge tag 'selinux-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2017-11-155-36/+47
|\ \
| * | selinux: remove extraneous initialization of slots_used and max_chain_lenColin Ian King2017-10-161-1/+1
| * | selinux: remove redundant assignment to lenColin Ian King2017-10-161-1/+0
| * | selinux: remove redundant assignment to strColin Ian King2017-10-161-3/+2
| * | selinux: fix build warningCorentin LABBE2017-10-041-2/+2
| * | selinux: fix build warning by removing the unused sid variableCorentin LABBE2017-10-041-2/+1
| * | selinux: Perform both commoncap and selinux xattr checksEric W. Biederman2017-10-041-25/+18
| * | selinux: Use kmem_cache for hashtab_nodeKyeongdon Kim2017-09-203-2/+23
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-11-155-67/+222
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-101-2/+2
| |\ \ \
| * | | | device_cgroup: prepare code for bpf-based device controllerRoman Gushchin2017-11-051-45/+2
| * | | | device_cgroup: add DEVCG_ prefix to ACC_* and DEV_* constantsRoman Gushchin2017-11-051-36/+36
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-0451-31/+80
| |\ \ \ \
| * \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-10-3012-840/+16
| |\ \ \ \ \
| * \ \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-10-2215-54/+90
| |\ \ \ \ \ \
| * | | | | | | selinux: bpf: Add addtional check for bpf object file receiveChenbo Feng2017-10-201-0/+49
| * | | | | | | selinux: bpf: Add selinux check for eBPF syscall operationsChenbo Feng2017-10-203-0/+117
| * | | | | | | security: bpf: Add LSM hooks for bpf object related syscallChenbo Feng2017-10-201-0/+32
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert...Linus Torvalds2017-11-141-39/+17
|\ \ \ \ \ \ \
| * | | | | | | ima: move to generic async completionGilad Ben-Yossef2017-11-031-39/+17
* | | | | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2017-11-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | timer: Remove expires and data arguments from DEFINE_TIMERKees Cook2017-10-051-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2017-11-132-15/+4
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'linus' into locking/core, to resolve conflictsIngo Molnar2017-11-0762-871/+96
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge tag 'v4.14-rc6' into locking/core, to pick up fixesIngo Molnar2017-10-2415-54/+90
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() wi...Will Deacon2017-10-102-15/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-11-1313-110/+108
|\ \ \ \ \ \ \ \
| * | | | | | | | ima: Remove redundant conditional operatorThiago Jung Bauermann2017-11-081-2/+2
| * | | | | | | | ima: Fix bool initialization/comparisonThomas Meyer2017-11-082-4/+4
| * | | | | | | | ima: check signature enforcement against cmdline param instead of CONFIGBruno E. O. Meneguele2017-11-081-3/+3
| * | | | | | | | ima: fix hash algorithm initializationBoshi Wang2017-11-081-0/+4
| * | | | | | | | EVM: Only complain about a missing HMAC key onceMatthew Garrett2017-11-081-1/+1
| * | | | | | | | EVM: Allow userspace to signal an RSA key has been loadedMatthew Garrett2017-11-082-12/+20
| * | | | | | | | EVM: Include security.apparmor in EVM measurementsMatthew Garrett2017-11-081-0/+3
| * | | | | | | | integrity: use kernel_read_file_from_path() to read x509 certsChristoph Hellwig2017-11-084-56/+13
| * | | | | | | | ima: always measure and audit files in policyMimi Zohar2017-11-083-30/+56
| * | | | | | | | ima: don't remove the securityfs policy fileMimi Zohar2017-11-081-2/+2
* | | | | | | | | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2017-11-136-99/+220
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Smack: Base support for overlayfsCasey Schaufler2017-11-021-0/+79
| * | | | | | | tomoyo: fix timestamping for y2038Arnd Bergmann2017-10-214-34/+13
| * | | | | | | capabilities: audit log other surprising conditionsRichard Guy Briggs2017-10-201-7/+22
| * | | | | | | capabilities: fix logic for effective root or real rootRichard Guy Briggs2017-10-201-3/+2
| * | | | | | | capabilities: invert logic for clarityRichard Guy Briggs2017-10-201-4/+4
| * | | | | | | capabilities: remove a layer of conditional logicRichard Guy Briggs2017-10-201-13/+10
| * | | | | | | capabilities: move audit log decision to functionRichard Guy Briggs2017-10-201-20/+30
| * | | | | | | capabilities: use intuitive names for id changesRichard Guy Briggs2017-10-201-6/+22
| * | | | | | | capabilities: use root_priveleged inline to clarify logicRichard Guy Briggs2017-10-201-2/+4
OpenPOWER on IntegriCloud