diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-06-12 23:18:55 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-06-12 23:18:55 +0530 |
| commit | 8cee66e33cf2e740a18c23a785694c7f83e24ee3 (patch) | |
| tree | f9ac8294378b518b5bb214ccd955f3fbf0763524 /security/keys/key.c | |
| parent | 611a390fbe4eb5e1ec2a7d535343c676c79fe292 (diff) | |
| parent | 01f99201744662692ca6888ee9aeee36776f47fb (diff) | |
Merge remote-tracking branch 'stable-rc/linux-4.4.y' into 4.4.72-rc-hikey4.4-72-rc-hikey-201706124.4.y-rc-hikey
Resolved conficts:
Makefile
fs/xfs/xfs_xattr.c
net/bridge/br_stp_if.c
net/ipv6/ip6_offload.c
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Diffstat (limited to 'security/keys/key.c')
| -rw-r--r-- | security/keys/key.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 534808915371..09c10b181881 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -934,12 +934,11 @@ int key_update(key_ref_t key_ref, const void *payload, size_t plen) /* the key must be writable */ ret = key_permission(key_ref, KEY_NEED_WRITE); if (ret < 0) - goto error; + return ret; /* attempt to update it if supported */ - ret = -EOPNOTSUPP; if (!key->type->update) - goto error; + return -EOPNOTSUPP; memset(&prep, 0, sizeof(prep)); prep.data = payload; |