Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/k... | Linus Torvalds | 2017-11-13 | 2 | -15/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'linus' into locking/core, to resolve conflicts | Ingo Molnar | 2017-11-07 | 62 | -871/+96 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge tag 'v4.14-rc6' into locking/core, to pick up fixes | Ingo Molnar | 2017-10-24 | 15 | -54/+90 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| * | | | | | | | | locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() wi... | Will Deacon | 2017-10-10 | 2 | -15/+4 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi... | Linus Torvalds | 2017-11-13 | 13 | -110/+108 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | ima: Remove redundant conditional operator | Thiago Jung Bauermann | 2017-11-08 | 1 | -2/+2 | |
| * | | | | | | | | ima: Fix bool initialization/comparison | Thomas Meyer | 2017-11-08 | 2 | -4/+4 | |
| * | | | | | | | | ima: check signature enforcement against cmdline param instead of CONFIG | Bruno E. O. Meneguele | 2017-11-08 | 1 | -3/+3 | |
| * | | | | | | | | ima: fix hash algorithm initialization | Boshi Wang | 2017-11-08 | 1 | -0/+4 | |
| * | | | | | | | | EVM: Only complain about a missing HMAC key once | Matthew Garrett | 2017-11-08 | 1 | -1/+1 | |
| * | | | | | | | | EVM: Allow userspace to signal an RSA key has been loaded | Matthew Garrett | 2017-11-08 | 2 | -12/+20 | |
| * | | | | | | | | EVM: Include security.apparmor in EVM measurements | Matthew Garrett | 2017-11-08 | 1 | -0/+3 | |
| * | | | | | | | | integrity: use kernel_read_file_from_path() to read x509 certs | Christoph Hellwig | 2017-11-08 | 4 | -56/+13 | |
| * | | | | | | | | ima: always measure and audit files in policy | Mimi Zohar | 2017-11-08 | 3 | -30/+56 | |
| * | | | | | | | | ima: don't remove the securityfs policy file | Mimi Zohar | 2017-11-08 | 1 | -2/+2 | |
* | | | | | | | | | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/... | Linus Torvalds | 2017-11-13 | 6 | -99/+220 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | Smack: Base support for overlayfs | Casey Schaufler | 2017-11-02 | 1 | -0/+79 | |
| * | | | | | | | tomoyo: fix timestamping for y2038 | Arnd Bergmann | 2017-10-21 | 4 | -34/+13 | |
| * | | | | | | | capabilities: audit log other surprising conditions | Richard Guy Briggs | 2017-10-20 | 1 | -7/+22 | |
| * | | | | | | | capabilities: fix logic for effective root or real root | Richard Guy Briggs | 2017-10-20 | 1 | -3/+2 | |
| * | | | | | | | capabilities: invert logic for clarity | Richard Guy Briggs | 2017-10-20 | 1 | -4/+4 | |
| * | | | | | | | capabilities: remove a layer of conditional logic | Richard Guy Briggs | 2017-10-20 | 1 | -13/+10 | |
| * | | | | | | | capabilities: move audit log decision to function | Richard Guy Briggs | 2017-10-20 | 1 | -20/+30 | |
| * | | | | | | | capabilities: use intuitive names for id changes | Richard Guy Briggs | 2017-10-20 | 1 | -6/+22 | |
| * | | | | | | | capabilities: use root_priveleged inline to clarify logic | Richard Guy Briggs | 2017-10-20 | 1 | -2/+4 | |
| * | | | | | | | capabilities: rename has_cap to has_fcap | Richard Guy Briggs | 2017-10-20 | 1 | -10/+10 | |
| * | | | | | | | capabilities: intuitive names for cap gain status | Richard Guy Briggs | 2017-10-20 | 1 | -7/+11 | |
| * | | | | | | | capabilities: factor out cap_bprm_set_creds privileged root | Richard Guy Briggs | 2017-10-20 | 1 | -28/+48 | |
* | | | | | | | | apparmor: fix off-by-one comparison on MAXMAPPED_SIG | John Johansen | 2017-11-08 | 1 | -2/+2 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge tag 'spdx_identifiers-4.14-rc8' of git://git.kernel.org/pub/scm/linux/k... | Linus Torvalds | 2017-11-02 | 49 | -0/+49 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | License cleanup: add SPDX GPL-2.0 license identifier to files with no license | Greg Kroah-Hartman | 2017-11-02 | 49 | -0/+49 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | KEYS: trusted: fix writing past end of buffer in trusted_read() | Eric Biggers | 2017-11-02 | 1 | -11/+12 | |
* | | | | | | | KEYS: return full count in keyring_read() if buffer is too small | Eric Biggers | 2017-11-02 | 1 | -20/+19 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Revert "apparmor: add base infastructure for socket mediation" | Linus Torvalds | 2017-10-26 | 12 | -840/+16 | |
|/ / / / / | ||||||
* | | | | | commoncap: move assignment of fs_ns to avoid null pointer dereference | Colin Ian King | 2017-10-19 | 1 | -1/+2 | |
* | | | | | Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5 | James Morris | 2017-10-19 | 14 | -53/+88 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | KEYS: load key flags and expiry time atomically in proc_keys_show() | Eric Biggers | 2017-10-18 | 1 | -10/+14 | |
| * | | | | KEYS: Load key expiry time atomically in keyring_search_iterator() | Eric Biggers | 2017-10-18 | 1 | -1/+3 | |
| * | | | | KEYS: load key flags and expiry time atomically in key_validate() | Eric Biggers | 2017-10-18 | 1 | -3/+4 | |
| * | | | | KEYS: don't let add_key() update an uninstantiated key | David Howells | 2017-10-18 | 1 | -0/+10 | |
| * | | | | KEYS: Fix race between updating and finding a negative key | David Howells | 2017-10-18 | 12 | -39/+49 | |
| * | | | | security/keys: BIG_KEY requires CONFIG_CRYPTO | Arnd Bergmann | 2017-10-18 | 1 | -0/+1 | |
| * | | | | KEYS: encrypted: fix dereference of NULL user_key_payload | Eric Biggers | 2017-10-12 | 1 | -0/+7 | |
| | |/ / | |/| | | ||||||
* | | | | lsm: fix smack_inode_removexattr and xattr_getsecurity memleak | Casey Schaufler | 2017-10-04 | 1 | -30/+25 | |
|/ / / | ||||||
* | | | Merge commit 'keys-fixes-20170927' into fixes-v4.14-rc3 | James Morris | 2017-09-28 | 9 | -152/+137 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | security/keys: rewrite all of big_key crypto | Jason A. Donenfeld | 2017-09-25 | 2 | -71/+60 | |
| * | | security/keys: properly zero out sensitive key material in big_key | Jason A. Donenfeld | 2017-09-25 | 1 | -6/+6 | |
| * | | KEYS: use kmemdup() in request_key_auth_new() | Eric Biggers | 2017-09-25 | 1 | -3/+2 | |
| * | | KEYS: restrict /proc/keys by credentials at open time | Eric Biggers | 2017-09-25 | 1 | -6/+2 | |
| * | | KEYS: reset parent each time before searching key_user_tree | Eric Biggers | 2017-09-25 | 1 | -2/+2 |