diff options
author | Steve French <sfrench@us.ibm.com> | 2007-11-05 09:38:08 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-11-05 09:38:08 -0500 |
commit | f1d662a7d5e5322e583aad6b3cfec03d8f27b435 (patch) | |
tree | 763e5feccec6636fcce282f7bfdf0ead414e85e6 | |
parent | e545937a51fe0cc78cea55752764daabb81ec96d (diff) |
[CIFS] Add upcall files for cifs to use spnego/kerberos
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r-- | fs/cifs/cifs_spnego.c | 124 | ||||
-rw-r--r-- | fs/cifs/cifs_spnego.h | 46 |
2 files changed, 170 insertions, 0 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c new file mode 100644 index 000000000000..e142faf2d0ae --- /dev/null +++ b/fs/cifs/cifs_spnego.c | |||
@@ -0,0 +1,124 @@ | |||
1 | /* | ||
2 | * fs/cifs/cifs_spnego.c -- SPNEGO upcall management for CIFS | ||
3 | * | ||
4 | * Copyright (c) 2007 Red Hat, Inc. | ||
5 | * Author(s): Jeff Layton (jlayton@redhat.com) | ||
6 | * | ||
7 | * This library is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU Lesser General Public License as published | ||
9 | * by the Free Software Foundation; either version 2.1 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This library is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See | ||
15 | * the GNU Lesser General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU Lesser General Public License | ||
18 | * along with this library; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | |||
22 | #include <linux/list.h> | ||
23 | #include <linux/string.h> | ||
24 | #include <keys/user-type.h> | ||
25 | #include <linux/key-type.h> | ||
26 | #include "cifsglob.h" | ||
27 | #include "cifs_spnego.h" | ||
28 | #include "cifs_debug.h" | ||
29 | |||
30 | /* create a new cifs key */ | ||
31 | static int | ||
32 | cifs_spnego_key_instantiate(struct key *key, const void *data, size_t datalen) | ||
33 | { | ||
34 | char *payload; | ||
35 | int ret; | ||
36 | |||
37 | ret = -ENOMEM; | ||
38 | payload = kmalloc(datalen, GFP_KERNEL); | ||
39 | if (!payload) | ||
40 | goto error; | ||
41 | |||
42 | /* attach the data */ | ||
43 | memcpy(payload, data, datalen); | ||
44 | rcu_assign_pointer(key->payload.data, payload); | ||
45 | ret = 0; | ||
46 | |||
47 | error: | ||
48 | return ret; | ||
49 | } | ||
50 | |||
51 | static void | ||
52 | cifs_spnego_key_destroy(struct key *key) | ||
53 | { | ||
54 | kfree(key->payload.data); | ||
55 | } | ||
56 | |||
57 | |||
58 | /* | ||
59 | * keytype for CIFS spnego keys | ||
60 | */ | ||
61 | struct key_type cifs_spnego_key_type = { | ||
62 | .name = "cifs.spnego", | ||
63 | .instantiate = cifs_spnego_key_instantiate, | ||
64 | .match = user_match, | ||
65 | .destroy = cifs_spnego_key_destroy, | ||
66 | .describe = user_describe, | ||
67 | }; | ||
68 | |||
69 | /* get a key struct with a SPNEGO security blob, suitable for session setup */ | ||
70 | struct key * | ||
71 | cifs_get_spnego_key(struct cifsSesInfo *sesInfo, const char *hostname) | ||
72 | { | ||
73 | struct TCP_Server_Info *server = sesInfo->server; | ||
74 | char *description, *dp; | ||
75 | size_t desc_len; | ||
76 | struct key *spnego_key; | ||
77 | |||
78 | |||
79 | /* version + ;ip{4|6}= + address + ;host=hostname + ;sec= + NULL */ | ||
80 | desc_len = 2 + 5 + 32 + 1 + 5 + strlen(hostname) + | ||
81 | strlen(";sec=krb5") + 1; | ||
82 | spnego_key = ERR_PTR(-ENOMEM); | ||
83 | description = kzalloc(desc_len, GFP_KERNEL); | ||
84 | if (description == NULL) | ||
85 | goto out; | ||
86 | |||
87 | dp = description; | ||
88 | /* start with version and hostname portion of UNC string */ | ||
89 | spnego_key = ERR_PTR(-EINVAL); | ||
90 | sprintf(dp, "%2.2x;host=%s;", CIFS_SPNEGO_UPCALL_VERSION, | ||
91 | hostname); | ||
92 | dp = description + strlen(description); | ||
93 | |||
94 | /* add the server address */ | ||
95 | if (server->addr.sockAddr.sin_family == AF_INET) | ||
96 | sprintf(dp, "ip4=" NIPQUAD_FMT, | ||
97 | NIPQUAD(server->addr.sockAddr.sin_addr)); | ||
98 | else if (server->addr.sockAddr.sin_family == AF_INET6) | ||
99 | sprintf(dp, "ip6=" NIP6_SEQFMT, | ||
100 | NIP6(server->addr.sockAddr6.sin6_addr)); | ||
101 | else | ||
102 | goto out; | ||
103 | |||
104 | dp = description + strlen(description); | ||
105 | |||
106 | /* for now, only sec=krb5 is valid */ | ||
107 | if (server->secType == Kerberos) | ||
108 | sprintf(dp, ";sec=krb5"); | ||
109 | else | ||
110 | goto out; | ||
111 | |||
112 | cFYI(1, ("key description = %s", description)); | ||
113 | spnego_key = request_key(&cifs_spnego_key_type, description, ""); | ||
114 | |||
115 | if (cifsFYI && !IS_ERR(spnego_key)) { | ||
116 | struct cifs_spnego_msg *msg = spnego_key->payload.data; | ||
117 | cifs_dump_mem("SPNEGO reply blob:", msg->data, | ||
118 | msg->secblob_len + msg->sesskey_len); | ||
119 | } | ||
120 | |||
121 | out: | ||
122 | kfree(description); | ||
123 | return spnego_key; | ||
124 | } | ||
diff --git a/fs/cifs/cifs_spnego.h b/fs/cifs/cifs_spnego.h new file mode 100644 index 000000000000..f443f3b35134 --- /dev/null +++ b/fs/cifs/cifs_spnego.h | |||
@@ -0,0 +1,46 @@ | |||
1 | /* | ||
2 | * fs/cifs/cifs_spnego.h -- SPNEGO upcall management for CIFS | ||
3 | * | ||
4 | * Copyright (c) 2007 Red Hat, Inc. | ||
5 | * Author(s): Jeff Layton (jlayton@redhat.com) | ||
6 | * Steve French (sfrench@us.ibm.com) | ||
7 | * | ||
8 | * This library is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU Lesser General Public License as published | ||
10 | * by the Free Software Foundation; either version 2.1 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This library is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See | ||
16 | * the GNU Lesser General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU Lesser General Public License | ||
19 | * along with this library; if not, write to the Free Software | ||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
21 | */ | ||
22 | |||
23 | #ifndef _CIFS_SPNEGO_H | ||
24 | #define _CIFS_SPNEGO_H | ||
25 | |||
26 | #define CIFS_SPNEGO_UPCALL_VERSION 1 | ||
27 | |||
28 | /* | ||
29 | * The version field should always be set to CIFS_SPNEGO_UPCALL_VERSION. | ||
30 | * The flags field is for future use. The request-key callout should set | ||
31 | * sesskey_len and secblob_len, and then concatenate the SessKey+SecBlob | ||
32 | * and stuff it in the data field. | ||
33 | */ | ||
34 | struct cifs_spnego_msg { | ||
35 | uint32_t version; | ||
36 | uint32_t flags; | ||
37 | uint32_t sesskey_len; | ||
38 | uint32_t secblob_len; | ||
39 | uint8_t data[1]; | ||
40 | }; | ||
41 | |||
42 | #ifdef __KERNEL__ | ||
43 | extern struct key_type cifs_spnego_key_type; | ||
44 | #endif /* KERNEL */ | ||
45 | |||
46 | #endif /* _CIFS_SPNEGO_H */ | ||