Merge the rest of Andrew's patches for -rc1: "A bunch of fixes and misc missed-out-on things. That'll do for -rc1. I still have a batch of IPC patches which still have a possible bug report which I'm chasing down." * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (25 commits) keys: use keyring_alloc() to create module signing keyring keys: fix unreachable code sendfile: allows bypassing of notifier events SGI-XP: handle non-fatal traps fat: fix incorrect function comment Documentation: ABI: remove testing/sysfs-devices-node proc: fix inconsistent lock state linux/kernel.h: fix DIV_ROUND_CLOSEST with unsigned divisors memcg: don't register hotcpu notifier from ->css_alloc() checkpatch: warn on uapi #includes that #include <uapi/... revert "rtc: recycle id when unloading a rtc driver" mm: clean up transparent hugepage sysfs error messages hfsplus: add error message for the case of failure of sync fs in delayed_sync_fs() method hfsplus: rework processing of hfs_btree_write() returned error hfsplus: rework processing errors in hfsplus_free_extents() hfsplus: avoid crash on failed block map free kcmp: include linux/ptrace.h drivers/rtc/rtc-imxdi.c: must include <linux/spinlock.h> mm: cma: WARN if freed memory is still in use exec: do not leave bprm->interp on stack ...
Showing the changes to kernel (2 of 30 files). Show all
Unified · Split
| @@ -4,6 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | #include <linux/string.h> |
| 5 | 5 | #include <linux/random.h> |
| 6 | 6 | #include <linux/module.h> |
| 7 | +#include <linux/ptrace.h> | |
| 7 | 8 | #include <linux/init.h> |
| 8 | 9 | #include <linux/errno.h> |
| 9 | 10 | #include <linux/cache.h> |
| @@ -34,18 +34,15 @@ static __init int module_verify_init(void) · 33 unmodified lines | ||
| 34 | 34 | { |
| 35 | 35 | pr_notice("Initialise module verification\n"); |
| 36 | 36 | |
| 37 | − modsign_keyring = key_alloc(&key_type_keyring, ".module_sign", | |
| 38 | − KUIDT_INIT(0), KGIDT_INIT(0), | |
| 39 | − current_cred(), | |
| 40 | − (KEY_POS_ALL & ~KEY_POS_SETATTR) | | |
| 41 | − KEY_USR_VIEW | KEY_USR_READ, | |
| 42 | − KEY_ALLOC_NOT_IN_QUOTA); | |
| 37 | + modsign_keyring = keyring_alloc(".module_sign", | |
| 38 | + KUIDT_INIT(0), KGIDT_INIT(0), | |
| 39 | + current_cred(), | |
| 40 | + ((KEY_POS_ALL & ~KEY_POS_SETATTR) | | |
| 41 | + KEY_USR_VIEW | KEY_USR_READ), | |
| 42 | + KEY_ALLOC_NOT_IN_QUOTA, NULL); | |
| 43 | 43 | if (IS_ERR(modsign_keyring)) |
| 44 | 44 | panic("Can't allocate module signing keyring\n"); |
| 45 | 45 | |
| 46 | − if (key_instantiate_and_link(modsign_keyring, NULL, 0, NULL, NULL) < 0) | |
| 47 | − panic("Can't instantiate module signing keyring\n"); | |
| 48 | − | |
| 49 | 46 | return 0; |
| 50 | 47 | } |
| 51 | 48 | |