diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/ima/ima_iint.c | 4 | ||||
-rw-r--r-- | security/keys/keyctl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c index b8dd693f8790..a4e2b1dac943 100644 --- a/security/integrity/ima/ima_iint.c +++ b/security/integrity/ima/ima_iint.c | |||
@@ -58,11 +58,11 @@ struct ima_iint_cache *ima_iint_insert(struct inode *inode) | |||
58 | 58 | ||
59 | if (!ima_initialized) | 59 | if (!ima_initialized) |
60 | return iint; | 60 | return iint; |
61 | iint = kmem_cache_alloc(iint_cache, GFP_KERNEL); | 61 | iint = kmem_cache_alloc(iint_cache, GFP_NOFS); |
62 | if (!iint) | 62 | if (!iint) |
63 | return iint; | 63 | return iint; |
64 | 64 | ||
65 | rc = radix_tree_preload(GFP_KERNEL); | 65 | rc = radix_tree_preload(GFP_NOFS); |
66 | if (rc < 0) | 66 | if (rc < 0) |
67 | goto out; | 67 | goto out; |
68 | 68 | ||
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 2fb28efc5326..06ec722897be 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c | |||
@@ -873,7 +873,7 @@ static long get_instantiation_keyring(key_serial_t ringid, | |||
873 | /* otherwise specify the destination keyring recorded in the | 873 | /* otherwise specify the destination keyring recorded in the |
874 | * authorisation key (any KEY_SPEC_*_KEYRING) */ | 874 | * authorisation key (any KEY_SPEC_*_KEYRING) */ |
875 | if (ringid >= KEY_SPEC_REQUESTOR_KEYRING) { | 875 | if (ringid >= KEY_SPEC_REQUESTOR_KEYRING) { |
876 | *_dest_keyring = rka->dest_keyring; | 876 | *_dest_keyring = key_get(rka->dest_keyring); |
877 | return 0; | 877 | return 0; |
878 | } | 878 | } |
879 | 879 | ||