diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-11-20 21:48:45 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-11-20 21:48:45 +0530 |
| commit | baa6b7f93aec81644160ca02a8a6a5ae3be4ce85 (patch) | |
| tree | 2a6bf027912ae74a354ce3b7d460d04ccfac4e55 /security/keys/key.c | |
| parent | 7bc703cde6592016ed3eadd8bd592ee9adbe6647 (diff) | |
| parent | f409333f361fed0c71c479b2a0c4e032d496cd94 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-18.03-androidlsk-v3.18-18.02-androidlsk-v3.18-17.11-androidlinux-linaro-lsk-v3.18-android
Conflicts:
net/packet/af_packet.c
Fix conflicts by refactoring changes from LTS commit
e4ffdf9ead59 ("packet: hold bind lock when rebinding to fanout hook"),
to align with the changes from AOSP commit 6bec212418d2
("UPSTREAM: packet: fix races in fanout_add()").
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'security/keys/key.c')
| -rw-r--r-- | security/keys/key.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 8f67cd3bb999..783738ea20ee 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -909,6 +909,16 @@ error: */ __key_link_end(keyring, &index_key, edit); + key = key_ref_to_ptr(key_ref); + if (test_bit(KEY_FLAG_USER_CONSTRUCT, &key->flags)) { + ret = wait_for_key_construction(key, true); + if (ret < 0) { + key_ref_put(key_ref); + key_ref = ERR_PTR(ret); + goto error_free_prep; + } + } + key_ref = __key_update(key_ref, &prep); goto error_free_prep; } |