projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[linux-drm-fsl-dcu.git]
/
net
/
ceph
/
ceph_common.c
diff --git
a/net/ceph/ceph_common.c
b/net/ceph/ceph_common.c
index 6b4d3a1684de082d21d30a0360465348c15363f1..bcbec33c6a14a8f5d962fb1d803a6503a6e11f9b 100644
(file)
--- a/
net/ceph/ceph_common.c
+++ b/
net/ceph/ceph_common.c
@@
-322,7
+322,7
@@
static int get_secret(struct ceph_crypto_key *dst, const char *name) {
goto out;
}
- ckey = ukey->payload.data;
+ ckey = ukey->payload.data
[0]
;
err = ceph_crypto_key_clone(dst, ckey);
if (err)
goto out_key;