summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'kconfig-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/ma...Linus Torvalds2018-12-292-10/+10
|\
| * treewide: surround Kconfig file paths with double quotesMasahiro Yamada2018-12-222-10/+10
* | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2018-12-281-1/+1
|\ \
| * | mm: convert totalram_pages and totalhigh_pages variables to atomicArun KS2018-12-281-1/+1
* | | Merge tag 'libnvdimm-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2018-12-283-11/+21
|\ \ \ | |/ / |/| |
| * | keys-encrypted: add nvdimm key format type to encrypted keysDave Jiang2018-12-131-9/+20
| * | keys: Export lookup_user_key to external usersDave Jiang2018-12-132-2/+1
* | | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert...Linus Torvalds2018-12-274-7/+6
|\ \ \
| * | | crypto: drop mask=CRYPTO_ALG_ASYNC from 'shash' tfm allocationsEric Biggers2018-11-204-7/+6
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2018-12-271-2/+2
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-12-203-7/+7
| |\ \ \
| * | | | net: use skb_sec_path helper in more placesFlorian Westphal2018-12-191-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-12-2729-39/+22
|\ \ \ \
| * | | | security: integrity: partial revert of make ima_main explicitly non-modularPaul Gortmaker2018-12-201-1/+1
| * | | | Merge tag 'v4.20-rc7' into next-generalJames Morris2018-12-174-4/+23
| |\ \ \ \ | | |/ / /
| * | | | security: fs: make inode explicitly non-modularPaul Gortmaker2018-12-121-4/+2
| * | | | security: audit and remove any unnecessary uses of module.hPaul Gortmaker2018-12-1224-24/+14
| * | | | security: integrity: make evm_main explicitly non-modularPaul Gortmaker2018-12-121-4/+1
| * | | | keys: remove needless modular infrastructure from ecryptfs_formatPaul Gortmaker2018-12-121-3/+2
| * | | | security: integrity: make ima_main explicitly non-modularPaul Gortmaker2018-12-121-4/+3
| * | | | Merge tag 'v4.20-rc2' into next-generalJames Morris2018-11-1239-326/+880
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | tomoyo: fix small typoYangtao Li2018-11-051-1/+1
* | | | | Merge tag 'selinux-pr-20181224' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-12-279-396/+625
|\ \ \ \ \
| * | | | | selinux: overhaul sidtab to fix bug and improve performanceOndrej Mosnacek2018-12-055-324/+468
| * | | | | selinux: use separate table for initial SID lookupOndrej Mosnacek2018-12-055-110/+173
| * | | | | selinux: make "selinux_policycap_names[]" const char *Alexey Dobriyan2018-11-262-2/+2
| * | | | | selinux: always allow mounting submountsOndrej Mosnacek2018-11-261-1/+1
| * | | | | selinux: refactor sidtab conversionOndrej Mosnacek2018-11-203-41/+42
| * | | | | selinux: policydb - fix byte order and alignment issuesOndrej Mosnacek2018-11-051-15/+36
| | |/ / / | |/| | |
* | | | | Merge tag 'audit-pr-20181224' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-12-271-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | audit: use current whenever possiblePaul Moore2018-11-261-1/+1
| |/ / /
* | | | ima: cleanup the match_token policy codeMimi Zohar2018-12-171-5/+5
* | | | security: don't use a negative Opt_err token indexLinus Torvalds2018-12-172-2/+2
| |_|/ |/| |
* | | Merge tag 'selinux-pr-20181129' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-11-291-1/+12
|\ \ \
| * | | selinux: add support for RTM_NEWCHAIN, RTM_DELCHAIN, and RTM_GETCHAINPaul Moore2018-11-291-1/+12
* | | | Merge tag 'selinux-pr-20181115' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-11-152-3/+10
|\ \ \ \ | |/ / /
| * | | selinux: fix non-MLS handling in mls_context_to_sid()Paul Moore2018-11-131-3/+7
| * | | selinux: check length properly in SCTP bind hookOndrej Mosnacek2018-11-131-0/+3
* | | | integrity: support new struct public_key_signature encoding fieldMimi Zohar2018-11-131-0/+1
| |/ / |/| |
* | | Merge tag 'apparmor-pr-2018-11-01' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2018-11-0212-17/+291
|\ \ \
| * | | apparmor: clean an indentation issue, remove extraneous spaceColin Ian King2018-11-011-1/+1
| * | | apparmor: fix checkpatch error in Parse secmark policyJohn Johansen2018-11-011-1/+1
| * | | apparmor: add #ifdef checks for secmark filteringArnd Bergmann2018-10-122-0/+12
| * | | apparmor: Fix uninitialized value in aa_split_fqnameZubin Mithra2018-10-031-2/+4
| * | | apparmor: don't try to replace stale label in ptraceme checkJann Horn2018-10-031-2/+2
| * | | apparmor: Replace spin_is_locked() with lockdepLance Roy2018-10-031-1/+1
| * | | apparmor: Allow filtering based on secmark policyMatthew Garrett2018-10-032-1/+177
| * | | apparmor: Parse secmark policyMatthew Garrett2018-10-034-0/+77
| * | | apparmor: Add a wildcard secidMatthew Garrett2018-10-032-2/+4
| * | | apparmor: don't try to replace stale label in ptrace access checkJann Horn2018-09-132-2/+4
OpenPOWER on IntegriCloud