forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libceph: Create a new key type "ceph".

Browse source 
This allows us to use existence of the key type as a feature test,
from userspace.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Tommi Virtanen 2011-03-28 14:59:38 -07:00 • committed by Sage Weil
parent e2c3d29b42
commit 4b2a58abd1
4 changed files with 85 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
net/ceph/ceph_common.c
View file

@ -6,7 +6,7 @@
#include <linux/inet.h>
#include <linux/in6.h>
#include <linux/key.h>
#include <keys/user-type.h>
#include <keys/ceph-type.h>
#include <linux/module.h>
#include <linux/mount.h>
#include <linux/parser.h>
@ -241,10 +241,9 @@ static int get_secret(struct ceph_crypto_key *dst, const char *name) {
struct key *ukey;
int key_err;
int err = 0;
struct user_key_payload *payload;
void *p;
struct ceph_crypto_key *ckey;
ukey = request_key(&key_type_user, name, NULL);
ukey = request_key(&key_type_ceph, name, NULL);
if (!ukey || IS_ERR(ukey)) {
/* request_key errors don't map nicely to mount(2)
errors; don't even try, but still printk */
@ -267,9 +266,8 @@ static int get_secret(struct ceph_crypto_key *dst, const char *name) {
goto out;
}
payload = ukey->payload.data;
p = payload->data;
err = ceph_crypto_key_decode(dst, &p, p + payload->datalen);
ckey = ukey->payload.data;
err = ceph_crypto_key_clone(dst, ckey);
if (err)
goto out_key;
/* pass through, err is 0 */
@ -583,10 +581,14 @@ static int __init init_ceph_lib(void)
if (ret < 0)
goto out;
ret = ceph_msgr_init();
ret = ceph_crypto_init();
if (ret < 0)
goto out_debugfs;
ret = ceph_msgr_init();
if (ret < 0)
goto out_crypto;
pr_info("loaded (mon/osd proto %d/%d, osdmap %d/%d %d/%d)\n",
CEPH_MONC_PROTOCOL, CEPH_OSDC_PROTOCOL,
CEPH_OSDMAP_VERSION, CEPH_OSDMAP_VERSION_EXT,
@ -594,6 +596,8 @@ static int __init init_ceph_lib(void)
return 0;
out_crypto:
ceph_crypto_shutdown();
out_debugfs:
ceph_debugfs_cleanup();
out:
@ -604,6 +608,7 @@ static void __exit exit_ceph_lib(void)
{
dout("exit_ceph_lib\n");
ceph_msgr_exit();
ceph_crypto_shutdown();
ceph_debugfs_cleanup();
}