diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-10 10:28:03 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-10 10:28:03 -0700 |
| commit | cec285f5fdb58cc760d0b882f9a2d94d7ff21a8a (patch) | |
| tree | 88e8a378175c9661554305eee42498a500d4d6dc /security/keys/keyring.c | |
| parent | 524b802ce0de62e8accdd0efd08b5db7766f13c3 (diff) | |
| parent | e9fd6ddcabf8695329f2462d3ece5a8442f2a8cf (diff) | |
Merge tag 'v3.18.20' into linux-linaro-lsk-v3.18
Linux 3.18.20
* tag 'v3.18.20': (52 commits)
Linux 3.18.20
blk-mq: fix CPU hotplug handling
SCSI: add 1024 max sectors black list flag
Fix firmware loader uevent buffer NULL pointer dereference
arm64: Don't report clear pmds and puds as huge
9p: don't leave a half-initialized inode sitting around
9p: forgetting to cancel request on interrupted zero-copy RPC
NFS: Fix size of NFSACL SETACL operations
watchdog: omap: assert the counter being stopped before reprogramming
of: return NUMA_NO_NODE from fallback of_node_to_nid()
USB: usbfs: allow URBs to be reaped after disconnection
dell-laptop: Fix allocating & freeing SMI buffer page
mac80211: prevent possible crypto tx tailroom corruption
security_syslog() should be called once only
__bitmap_parselist: fix bug in empty string handling
mmc: card: Fixup request missing in mmc_blk_issue_rw_rq
iser-target: Fix possible deadlock in RDMA_CM connection error
iscsi-target: Convert iscsi_thread_set usage to kthread.h
ACPICA: Tables: Fix an issue that FACS initialization is performed twice
Btrfs: fix memory leak in the extent_same ioctl
...
Diffstat (limited to 'security/keys/keyring.c')
| -rw-r--r-- | security/keys/keyring.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index e72548b5897e..d33437007ad2 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c @@ -1181,9 +1181,11 @@ void __key_link_end(struct key *keyring, if (index_key->type == &key_type_keyring) up_write(&keyring_serialise_link_sem); - if (edit && !edit->dead_leaf) { - key_payload_reserve(keyring, - keyring->datalen - KEYQUOTA_LINK_BYTES); + if (edit) { + if (!edit->dead_leaf) { + key_payload_reserve(keyring, + keyring->datalen - KEYQUOTA_LINK_BYTES); + } assoc_array_cancel_edit(edit); } up_write(&keyring->sem); |