summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-01-174-26/+41
|\
| * Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2018-01-141-1/+1
| |\
| | * security/Kconfig: Correct the Documentation reference for PTIW. Trevor King2018-01-141-1/+1
| * | apparmor: Fix regression in profile conflict logicMatthew Garrett2018-01-121-4/+5
| * | apparmor: fix ptrace label match when matching stacked labelsJohn Johansen2018-01-122-21/+35
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-01-093-13/+31
|\ \ \ | |/ /
| * | Merge tag 'apparmor-pr-2018-01-07' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2018-01-071-1/+11
| |\ \
| | * | apparmor: fix regression in mount mediation when feature set is pinnedJohn Johansen2018-01-051-1/+11
| * | | Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2018-01-031-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | x86/pti: Enable PTI by defaultThomas Gleixner2018-01-031-0/+1
| * | | capabilities: fix buffer overread on very short xattrEric Biggers2018-01-021-12/+9
| | |/ | |/|
| * | Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2017-12-291-0/+10
| |\ \ | | |/
| | * x86/mm/pti: Add KconfigDave Hansen2017-12-231-0/+10
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-12-163-26/+47
|\ \ \ | |/ /
| * | KEYS: reject NULL restriction string when type is specifiedEric Biggers2017-12-081-14/+10
| * | security: keys: remove redundant assignment to key_refColin Ian King2017-12-081-1/+0
| * | KEYS: add missing permission check for request_key() destinationEric Biggers2017-12-081-9/+37
| * | KEYS: remove unnecessary get/put of explicit dest_keyringEric Biggers2017-12-081-2/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-12-051-5/+7
|\ \ \ | |/ /
| * | Merge tag 'apparmor-pr-2017-11-30' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2017-11-301-5/+7
| |\ \
| | * | apparmor: fix oops in audit_signal_cb hookJohn Johansen2017-11-271-5/+7
| | |/
* | | net: Create and use new helper xfrm_dst_child().David Miller2017-11-301-1/+1
|/ /
* | Rename superblock flags (MS_xyz -> SB_xyz)Linus Torvalds2017-11-272-2/+2
* | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2017-11-251-2/+2
|\ \
| * | treewide: Switch DEFINE_TIMER callbacks to struct timer_list *Kees Cook2017-11-211-2/+2
* | | Merge branch 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2017-11-237-56/+47
|\ \ \
| * \ \ Merge tag 'keys-next-20171123' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2017-11-247-56/+47
| |\ \ \ | | |/ / | |/| |
| | * | security: keys: Replace time_t with time64_t for struct key_preparsed_payloadBaolin Wang2017-11-151-4/+4
| | * | security: keys: Replace time_t/timespec with time64_tBaolin Wang2017-11-157-52/+43
* | | | Merge tag 'apparmor-pr-2017-11-21' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2017-11-2311-71/+91
|\ \ \ \ | |/ / / |/| | |
| * | | apparmor: fix possible recursive lock warning in __aa_create_nsJohn Johansen2017-11-215-21/+21
| * | | apparmor: fix locking when creating a new complain profile.John Johansen2017-11-211-3/+15
| * | | apparmor: fix profile attachment for special unconfined profilesJohn Johansen2017-11-211-1/+3
| * | | apparmor: ensure that undecidable profile attachments failJohn Johansen2017-11-211-14/+32
| * | | apparmor: fix leak of null profile name if profile allocation failsJohn Johansen2017-11-211-1/+2
| * | | apparmor: remove unused redundant variable stopColin Ian King2017-11-211-3/+0
| * | | apparmor: Fix bool initialization/comparisonThomas Meyer2017-11-211-4/+4
| * | | apparmor: initialized returned struct aa_permsArnd Bergmann2017-11-213-22/+12
| * | | apparmor: fix spelling mistake: "resoure" -> "resource"Colin Ian King2017-11-211-2/+2
* | | | 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
OpenPOWER on IntegriCloud