Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 683428fae8c73d7d7da0fa2e0b6beb4d8df4e808

Authored by Eric W. Biederman
1 parent 90602c7b19
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

sunrpc: Update svcgss xdr handle to rpsec_contect cache 

For each received uid call make_kuid and validate the result.
For each received gid call make_kgid and validate the result.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

Showing 1 changed file with 13 additions and 5 deletions Inline Diff

net/sunrpc/auth_gss/svcauth_gss.c
Diff comments   View file @ 683428f
1 /* 1 /*
2 * Neil Brown <neilb@cse.unsw.edu.au> 2 * Neil Brown <neilb@cse.unsw.edu.au>
3 * J. Bruce Fields <bfields@umich.edu> 3 * J. Bruce Fields <bfields@umich.edu>
4 * Andy Adamson <andros@umich.edu> 4 * Andy Adamson <andros@umich.edu>
5 * Dug Song <dugsong@monkey.org> 5 * Dug Song <dugsong@monkey.org>
6 * 6 *
7 * RPCSEC_GSS server authentication. 7 * RPCSEC_GSS server authentication.
8 * This implements RPCSEC_GSS as defined in rfc2203 (rpcsec_gss) and rfc2078 8 * This implements RPCSEC_GSS as defined in rfc2203 (rpcsec_gss) and rfc2078
9 * (gssapi) 9 * (gssapi)
10 * 10 *
11 * The RPCSEC_GSS involves three stages: 11 * The RPCSEC_GSS involves three stages:
12 * 1/ context creation 12 * 1/ context creation
13 * 2/ data exchange 13 * 2/ data exchange
14 * 3/ context destruction 14 * 3/ context destruction
15 * 15 *
16 * Context creation is handled largely by upcalls to user-space. 16 * Context creation is handled largely by upcalls to user-space.
17 * In particular, GSS_Accept_sec_context is handled by an upcall 17 * In particular, GSS_Accept_sec_context is handled by an upcall
18 * Data exchange is handled entirely within the kernel 18 * Data exchange is handled entirely within the kernel
19 * In particular, GSS_GetMIC, GSS_VerifyMIC, GSS_Seal, GSS_Unseal are in-kernel. 19 * In particular, GSS_GetMIC, GSS_VerifyMIC, GSS_Seal, GSS_Unseal are in-kernel.
20 * Context destruction is handled in-kernel 20 * Context destruction is handled in-kernel
21 * GSS_Delete_sec_context is in-kernel 21 * GSS_Delete_sec_context is in-kernel
22 * 22 *
23 * Context creation is initiated by a RPCSEC_GSS_INIT request arriving. 23 * Context creation is initiated by a RPCSEC_GSS_INIT request arriving.
24 * The context handle and gss_token are used as a key into the rpcsec_init cache. 24 * The context handle and gss_token are used as a key into the rpcsec_init cache.
25 * The content of this cache includes some of the outputs of GSS_Accept_sec_context, 25 * The content of this cache includes some of the outputs of GSS_Accept_sec_context,
26 * being major_status, minor_status, context_handle, reply_token. 26 * being major_status, minor_status, context_handle, reply_token.
27 * These are sent back to the client. 27 * These are sent back to the client.
28 * Sequence window management is handled by the kernel. The window size if currently 28 * Sequence window management is handled by the kernel. The window size if currently
29 * a compile time constant. 29 * a compile time constant.
30 * 30 *
31 * When user-space is happy that a context is established, it places an entry 31 * When user-space is happy that a context is established, it places an entry
32 * in the rpcsec_context cache. The key for this cache is the context_handle. 32 * in the rpcsec_context cache. The key for this cache is the context_handle.
33 * The content includes: 33 * The content includes:
34 * uid/gidlist - for determining access rights 34 * uid/gidlist - for determining access rights
35 * mechanism type 35 * mechanism type
36 * mechanism specific information, such as a key 36 * mechanism specific information, such as a key
37 * 37 *
38 */ 38 */
39 39
40 #include <linux/slab.h> 40 #include <linux/slab.h>
41 #include <linux/types.h> 41 #include <linux/types.h>
42 #include <linux/module.h> 42 #include <linux/module.h>
43 #include <linux/pagemap.h> 43 #include <linux/pagemap.h>
44 #include <linux/user_namespace.h> 44 #include <linux/user_namespace.h>
45 45
46 #include <linux/sunrpc/auth_gss.h> 46 #include <linux/sunrpc/auth_gss.h>
47 #include <linux/sunrpc/gss_err.h> 47 #include <linux/sunrpc/gss_err.h>
48 #include <linux/sunrpc/svcauth.h> 48 #include <linux/sunrpc/svcauth.h>
49 #include <linux/sunrpc/svcauth_gss.h> 49 #include <linux/sunrpc/svcauth_gss.h>
50 #include <linux/sunrpc/cache.h> 50 #include <linux/sunrpc/cache.h>
51 51
52 #include "../netns.h" 52 #include "../netns.h"
53 53
54 #ifdef RPC_DEBUG 54 #ifdef RPC_DEBUG
55 # define RPCDBG_FACILITY RPCDBG_AUTH 55 # define RPCDBG_FACILITY RPCDBG_AUTH
56 #endif 56 #endif
57 57
58 /* The rpcsec_init cache is used for mapping RPCSEC_GSS_{,CONT_}INIT requests 58 /* The rpcsec_init cache is used for mapping RPCSEC_GSS_{,CONT_}INIT requests
59 * into replies. 59 * into replies.
60 * 60 *
61 * Key is context handle (\x if empty) and gss_token. 61 * Key is context handle (\x if empty) and gss_token.
62 * Content is major_status minor_status (integers) context_handle, reply_token. 62 * Content is major_status minor_status (integers) context_handle, reply_token.
63 * 63 *
64 */ 64 */
65 65
66 static int netobj_equal(struct xdr_netobj *a, struct xdr_netobj *b) 66 static int netobj_equal(struct xdr_netobj *a, struct xdr_netobj *b)
67 { 67 {
68 return a->len == b->len && 0 == memcmp(a->data, b->data, a->len); 68 return a->len == b->len && 0 == memcmp(a->data, b->data, a->len);
69 } 69 }
70 70
71 #define RSI_HASHBITS 6 71 #define RSI_HASHBITS 6
72 #define RSI_HASHMAX (1<<RSI_HASHBITS) 72 #define RSI_HASHMAX (1<<RSI_HASHBITS)
73 73
74 struct rsi { 74 struct rsi {
75 struct cache_head h; 75 struct cache_head h;
76 struct xdr_netobj in_handle, in_token; 76 struct xdr_netobj in_handle, in_token;
77 struct xdr_netobj out_handle, out_token; 77 struct xdr_netobj out_handle, out_token;
78 int major_status, minor_status; 78 int major_status, minor_status;
79 }; 79 };
80 80
81 static struct rsi *rsi_update(struct cache_detail *cd, struct rsi *new, struct rsi *old); 81 static struct rsi *rsi_update(struct cache_detail *cd, struct rsi *new, struct rsi *old);
82 static struct rsi *rsi_lookup(struct cache_detail *cd, struct rsi *item); 82 static struct rsi *rsi_lookup(struct cache_detail *cd, struct rsi *item);
83 83
84 static void rsi_free(struct rsi *rsii) 84 static void rsi_free(struct rsi *rsii)
85 { 85 {
86 kfree(rsii->in_handle.data); 86 kfree(rsii->in_handle.data);
87 kfree(rsii->in_token.data); 87 kfree(rsii->in_token.data);
88 kfree(rsii->out_handle.data); 88 kfree(rsii->out_handle.data);
89 kfree(rsii->out_token.data); 89 kfree(rsii->out_token.data);
90 } 90 }
91 91
92 static void rsi_put(struct kref *ref) 92 static void rsi_put(struct kref *ref)
93 { 93 {
94 struct rsi *rsii = container_of(ref, struct rsi, h.ref); 94 struct rsi *rsii = container_of(ref, struct rsi, h.ref);
95 rsi_free(rsii); 95 rsi_free(rsii);
96 kfree(rsii); 96 kfree(rsii);
97 } 97 }
98 98
99 static inline int rsi_hash(struct rsi *item) 99 static inline int rsi_hash(struct rsi *item)
100 { 100 {
101 return hash_mem(item->in_handle.data, item->in_handle.len, RSI_HASHBITS) 101 return hash_mem(item->in_handle.data, item->in_handle.len, RSI_HASHBITS)
102 ^ hash_mem(item->in_token.data, item->in_token.len, RSI_HASHBITS); 102 ^ hash_mem(item->in_token.data, item->in_token.len, RSI_HASHBITS);
103 } 103 }
104 104
105 static int rsi_match(struct cache_head *a, struct cache_head *b) 105 static int rsi_match(struct cache_head *a, struct cache_head *b)
106 { 106 {
107 struct rsi *item = container_of(a, struct rsi, h); 107 struct rsi *item = container_of(a, struct rsi, h);
108 struct rsi *tmp = container_of(b, struct rsi, h); 108 struct rsi *tmp = container_of(b, struct rsi, h);
109 return netobj_equal(&item->in_handle, &tmp->in_handle) && 109 return netobj_equal(&item->in_handle, &tmp->in_handle) &&
110 netobj_equal(&item->in_token, &tmp->in_token); 110 netobj_equal(&item->in_token, &tmp->in_token);
111 } 111 }
112 112
113 static int dup_to_netobj(struct xdr_netobj *dst, char *src, int len) 113 static int dup_to_netobj(struct xdr_netobj *dst, char *src, int len)
114 { 114 {
115 dst->len = len; 115 dst->len = len;
116 dst->data = (len ? kmemdup(src, len, GFP_KERNEL) : NULL); 116 dst->data = (len ? kmemdup(src, len, GFP_KERNEL) : NULL);
117 if (len && !dst->data) 117 if (len && !dst->data)
118 return -ENOMEM; 118 return -ENOMEM;
119 return 0; 119 return 0;
120 } 120 }
121 121
122 static inline int dup_netobj(struct xdr_netobj *dst, struct xdr_netobj *src) 122 static inline int dup_netobj(struct xdr_netobj *dst, struct xdr_netobj *src)
123 { 123 {
124 return dup_to_netobj(dst, src->data, src->len); 124 return dup_to_netobj(dst, src->data, src->len);
125 } 125 }
126 126
127 static void rsi_init(struct cache_head *cnew, struct cache_head *citem) 127 static void rsi_init(struct cache_head *cnew, struct cache_head *citem)
128 { 128 {
129 struct rsi *new = container_of(cnew, struct rsi, h); 129 struct rsi *new = container_of(cnew, struct rsi, h);
130 struct rsi *item = container_of(citem, struct rsi, h); 130 struct rsi *item = container_of(citem, struct rsi, h);
131 131
132 new->out_handle.data = NULL; 132 new->out_handle.data = NULL;
133 new->out_handle.len = 0; 133 new->out_handle.len = 0;
134 new->out_token.data = NULL; 134 new->out_token.data = NULL;
135 new->out_token.len = 0; 135 new->out_token.len = 0;
136 new->in_handle.len = item->in_handle.len; 136 new->in_handle.len = item->in_handle.len;
137 item->in_handle.len = 0; 137 item->in_handle.len = 0;
138 new->in_token.len = item->in_token.len; 138 new->in_token.len = item->in_token.len;
139 item->in_token.len = 0; 139 item->in_token.len = 0;
140 new->in_handle.data = item->in_handle.data; 140 new->in_handle.data = item->in_handle.data;
141 item->in_handle.data = NULL; 141 item->in_handle.data = NULL;
142 new->in_token.data = item->in_token.data; 142 new->in_token.data = item->in_token.data;
143 item->in_token.data = NULL; 143 item->in_token.data = NULL;
144 } 144 }
145 145
146 static void update_rsi(struct cache_head *cnew, struct cache_head *citem) 146 static void update_rsi(struct cache_head *cnew, struct cache_head *citem)
147 { 147 {
148 struct rsi *new = container_of(cnew, struct rsi, h); 148 struct rsi *new = container_of(cnew, struct rsi, h);
149 struct rsi *item = container_of(citem, struct rsi, h); 149 struct rsi *item = container_of(citem, struct rsi, h);
150 150
151 BUG_ON(new->out_handle.data || new->out_token.data); 151 BUG_ON(new->out_handle.data || new->out_token.data);
152 new->out_handle.len = item->out_handle.len; 152 new->out_handle.len = item->out_handle.len;
153 item->out_handle.len = 0; 153 item->out_handle.len = 0;
154 new->out_token.len = item->out_token.len; 154 new->out_token.len = item->out_token.len;
155 item->out_token.len = 0; 155 item->out_token.len = 0;
156 new->out_handle.data = item->out_handle.data; 156 new->out_handle.data = item->out_handle.data;
157 item->out_handle.data = NULL; 157 item->out_handle.data = NULL;
158 new->out_token.data = item->out_token.data; 158 new->out_token.data = item->out_token.data;
159 item->out_token.data = NULL; 159 item->out_token.data = NULL;
160 160
161 new->major_status = item->major_status; 161 new->major_status = item->major_status;
162 new->minor_status = item->minor_status; 162 new->minor_status = item->minor_status;
163 } 163 }
164 164
165 static struct cache_head *rsi_alloc(void) 165 static struct cache_head *rsi_alloc(void)
166 { 166 {
167 struct rsi *rsii = kmalloc(sizeof(*rsii), GFP_KERNEL); 167 struct rsi *rsii = kmalloc(sizeof(*rsii), GFP_KERNEL);
168 if (rsii) 168 if (rsii)
169 return &rsii->h; 169 return &rsii->h;
170 else 170 else
171 return NULL; 171 return NULL;
172 } 172 }
173 173
174 static void rsi_request(struct cache_detail *cd, 174 static void rsi_request(struct cache_detail *cd,
175 struct cache_head *h, 175 struct cache_head *h,
176 char **bpp, int *blen) 176 char **bpp, int *blen)
177 { 177 {
178 struct rsi *rsii = container_of(h, struct rsi, h); 178 struct rsi *rsii = container_of(h, struct rsi, h);
179 179
180 qword_addhex(bpp, blen, rsii->in_handle.data, rsii->in_handle.len); 180 qword_addhex(bpp, blen, rsii->in_handle.data, rsii->in_handle.len);
181 qword_addhex(bpp, blen, rsii->in_token.data, rsii->in_token.len); 181 qword_addhex(bpp, blen, rsii->in_token.data, rsii->in_token.len);
182 (*bpp)[-1] = '\n'; 182 (*bpp)[-1] = '\n';
183 } 183 }
184 184
185 static int rsi_upcall(struct cache_detail *cd, struct cache_head *h) 185 static int rsi_upcall(struct cache_detail *cd, struct cache_head *h)
186 { 186 {
187 return sunrpc_cache_pipe_upcall(cd, h, rsi_request); 187 return sunrpc_cache_pipe_upcall(cd, h, rsi_request);
188 } 188 }
189 189
190 190
191 static int rsi_parse(struct cache_detail *cd, 191 static int rsi_parse(struct cache_detail *cd,
192 char *mesg, int mlen) 192 char *mesg, int mlen)
193 { 193 {
194 /* context token expiry major minor context token */ 194 /* context token expiry major minor context token */
195 char *buf = mesg; 195 char *buf = mesg;
196 char *ep; 196 char *ep;
197 int len; 197 int len;
198 struct rsi rsii, *rsip = NULL; 198 struct rsi rsii, *rsip = NULL;
199 time_t expiry; 199 time_t expiry;
200 int status = -EINVAL; 200 int status = -EINVAL;
201 201
202 memset(&rsii, 0, sizeof(rsii)); 202 memset(&rsii, 0, sizeof(rsii));
203 /* handle */ 203 /* handle */
204 len = qword_get(&mesg, buf, mlen); 204 len = qword_get(&mesg, buf, mlen);
205 if (len < 0) 205 if (len < 0)
206 goto out; 206 goto out;
207 status = -ENOMEM; 207 status = -ENOMEM;
208 if (dup_to_netobj(&rsii.in_handle, buf, len)) 208 if (dup_to_netobj(&rsii.in_handle, buf, len))
209 goto out; 209 goto out;
210 210
211 /* token */ 211 /* token */
212 len = qword_get(&mesg, buf, mlen); 212 len = qword_get(&mesg, buf, mlen);
213 status = -EINVAL; 213 status = -EINVAL;
214 if (len < 0) 214 if (len < 0)
215 goto out; 215 goto out;
216 status = -ENOMEM; 216 status = -ENOMEM;
217 if (dup_to_netobj(&rsii.in_token, buf, len)) 217 if (dup_to_netobj(&rsii.in_token, buf, len))
218 goto out; 218 goto out;
219 219
220 rsip = rsi_lookup(cd, &rsii); 220 rsip = rsi_lookup(cd, &rsii);
221 if (!rsip) 221 if (!rsip)
222 goto out; 222 goto out;
223 223
224 rsii.h.flags = 0; 224 rsii.h.flags = 0;
225 /* expiry */ 225 /* expiry */
226 expiry = get_expiry(&mesg); 226 expiry = get_expiry(&mesg);
227 status = -EINVAL; 227 status = -EINVAL;
228 if (expiry == 0) 228 if (expiry == 0)
229 goto out; 229 goto out;
230 230
231 /* major/minor */ 231 /* major/minor */
232 len = qword_get(&mesg, buf, mlen); 232 len = qword_get(&mesg, buf, mlen);
233 if (len <= 0) 233 if (len <= 0)
234 goto out; 234 goto out;
235 rsii.major_status = simple_strtoul(buf, &ep, 10); 235 rsii.major_status = simple_strtoul(buf, &ep, 10);
236 if (*ep) 236 if (*ep)
237 goto out; 237 goto out;
238 len = qword_get(&mesg, buf, mlen); 238 len = qword_get(&mesg, buf, mlen);
239 if (len <= 0) 239 if (len <= 0)
240 goto out; 240 goto out;
241 rsii.minor_status = simple_strtoul(buf, &ep, 10); 241 rsii.minor_status = simple_strtoul(buf, &ep, 10);
242 if (*ep) 242 if (*ep)
243 goto out; 243 goto out;
244 244
245 /* out_handle */ 245 /* out_handle */
246 len = qword_get(&mesg, buf, mlen); 246 len = qword_get(&mesg, buf, mlen);
247 if (len < 0) 247 if (len < 0)
248 goto out; 248 goto out;
249 status = -ENOMEM; 249 status = -ENOMEM;
250 if (dup_to_netobj(&rsii.out_handle, buf, len)) 250 if (dup_to_netobj(&rsii.out_handle, buf, len))
251 goto out; 251 goto out;
252 252
253 /* out_token */ 253 /* out_token */
254 len = qword_get(&mesg, buf, mlen); 254 len = qword_get(&mesg, buf, mlen);
255 status = -EINVAL; 255 status = -EINVAL;
256 if (len < 0) 256 if (len < 0)
257 goto out; 257 goto out;
258 status = -ENOMEM; 258 status = -ENOMEM;
259 if (dup_to_netobj(&rsii.out_token, buf, len)) 259 if (dup_to_netobj(&rsii.out_token, buf, len))
260 goto out; 260 goto out;
261 rsii.h.expiry_time = expiry; 261 rsii.h.expiry_time = expiry;
262 rsip = rsi_update(cd, &rsii, rsip); 262 rsip = rsi_update(cd, &rsii, rsip);
263 status = 0; 263 status = 0;
264 out: 264 out:
265 rsi_free(&rsii); 265 rsi_free(&rsii);
266 if (rsip) 266 if (rsip)
267 cache_put(&rsip->h, cd); 267 cache_put(&rsip->h, cd);
268 else 268 else
269 status = -ENOMEM; 269 status = -ENOMEM;
270 return status; 270 return status;
271 } 271 }
272 272
273 static struct cache_detail rsi_cache_template = { 273 static struct cache_detail rsi_cache_template = {
274 .owner = THIS_MODULE, 274 .owner = THIS_MODULE,
275 .hash_size = RSI_HASHMAX, 275 .hash_size = RSI_HASHMAX,
276 .name = "auth.rpcsec.init", 276 .name = "auth.rpcsec.init",
277 .cache_put = rsi_put, 277 .cache_put = rsi_put,
278 .cache_upcall = rsi_upcall, 278 .cache_upcall = rsi_upcall,
279 .cache_parse = rsi_parse, 279 .cache_parse = rsi_parse,
280 .match = rsi_match, 280 .match = rsi_match,
281 .init = rsi_init, 281 .init = rsi_init,
282 .update = update_rsi, 282 .update = update_rsi,
283 .alloc = rsi_alloc, 283 .alloc = rsi_alloc,
284 }; 284 };
285 285
286 static struct rsi *rsi_lookup(struct cache_detail *cd, struct rsi *item) 286 static struct rsi *rsi_lookup(struct cache_detail *cd, struct rsi *item)
287 { 287 {
288 struct cache_head *ch; 288 struct cache_head *ch;
289 int hash = rsi_hash(item); 289 int hash = rsi_hash(item);
290 290
291 ch = sunrpc_cache_lookup(cd, &item->h, hash); 291 ch = sunrpc_cache_lookup(cd, &item->h, hash);
292 if (ch) 292 if (ch)
293 return container_of(ch, struct rsi, h); 293 return container_of(ch, struct rsi, h);
294 else 294 else
295 return NULL; 295 return NULL;
296 } 296 }
297 297
298 static struct rsi *rsi_update(struct cache_detail *cd, struct rsi *new, struct rsi *old) 298 static struct rsi *rsi_update(struct cache_detail *cd, struct rsi *new, struct rsi *old)
299 { 299 {
300 struct cache_head *ch; 300 struct cache_head *ch;
301 int hash = rsi_hash(new); 301 int hash = rsi_hash(new);
302 302
303 ch = sunrpc_cache_update(cd, &new->h, 303 ch = sunrpc_cache_update(cd, &new->h,
304 &old->h, hash); 304 &old->h, hash);
305 if (ch) 305 if (ch)
306 return container_of(ch, struct rsi, h); 306 return container_of(ch, struct rsi, h);
307 else 307 else
308 return NULL; 308 return NULL;
309 } 309 }
310 310
311 311
312 /* 312 /*
313 * The rpcsec_context cache is used to store a context that is 313 * The rpcsec_context cache is used to store a context that is
314 * used in data exchange. 314 * used in data exchange.
315 * The key is a context handle. The content is: 315 * The key is a context handle. The content is:
316 * uid, gidlist, mechanism, service-set, mech-specific-data 316 * uid, gidlist, mechanism, service-set, mech-specific-data
317 */ 317 */
318 318
319 #define RSC_HASHBITS 10 319 #define RSC_HASHBITS 10
320 #define RSC_HASHMAX (1<<RSC_HASHBITS) 320 #define RSC_HASHMAX (1<<RSC_HASHBITS)
321 321
322 #define GSS_SEQ_WIN 128 322 #define GSS_SEQ_WIN 128
323 323
324 struct gss_svc_seq_data { 324 struct gss_svc_seq_data {
325 /* highest seq number seen so far: */ 325 /* highest seq number seen so far: */
326 int sd_max; 326 int sd_max;
327 /* for i such that sd_max-GSS_SEQ_WIN < i <= sd_max, the i-th bit of 327 /* for i such that sd_max-GSS_SEQ_WIN < i <= sd_max, the i-th bit of
328 * sd_win is nonzero iff sequence number i has been seen already: */ 328 * sd_win is nonzero iff sequence number i has been seen already: */
329 unsigned long sd_win[GSS_SEQ_WIN/BITS_PER_LONG]; 329 unsigned long sd_win[GSS_SEQ_WIN/BITS_PER_LONG];
330 spinlock_t sd_lock; 330 spinlock_t sd_lock;
331 }; 331 };
332 332
333 struct rsc { 333 struct rsc {
334 struct cache_head h; 334 struct cache_head h;
335 struct xdr_netobj handle; 335 struct xdr_netobj handle;
336 struct svc_cred cred; 336 struct svc_cred cred;
337 struct gss_svc_seq_data seqdata; 337 struct gss_svc_seq_data seqdata;
338 struct gss_ctx *mechctx; 338 struct gss_ctx *mechctx;
339 }; 339 };
340 340
341 static struct rsc *rsc_update(struct cache_detail *cd, struct rsc *new, struct rsc *old); 341 static struct rsc *rsc_update(struct cache_detail *cd, struct rsc *new, struct rsc *old);
342 static struct rsc *rsc_lookup(struct cache_detail *cd, struct rsc *item); 342 static struct rsc *rsc_lookup(struct cache_detail *cd, struct rsc *item);
343 343
344 static void rsc_free(struct rsc *rsci) 344 static void rsc_free(struct rsc *rsci)
345 { 345 {
346 kfree(rsci->handle.data); 346 kfree(rsci->handle.data);
347 if (rsci->mechctx) 347 if (rsci->mechctx)
348 gss_delete_sec_context(&rsci->mechctx); 348 gss_delete_sec_context(&rsci->mechctx);
349 free_svc_cred(&rsci->cred); 349 free_svc_cred(&rsci->cred);
350 } 350 }
351 351
352 static void rsc_put(struct kref *ref) 352 static void rsc_put(struct kref *ref)
353 { 353 {
354 struct rsc *rsci = container_of(ref, struct rsc, h.ref); 354 struct rsc *rsci = container_of(ref, struct rsc, h.ref);
355 355
356 rsc_free(rsci); 356 rsc_free(rsci);
357 kfree(rsci); 357 kfree(rsci);
358 } 358 }
359 359
360 static inline int 360 static inline int
361 rsc_hash(struct rsc *rsci) 361 rsc_hash(struct rsc *rsci)
362 { 362 {
363 return hash_mem(rsci->handle.data, rsci->handle.len, RSC_HASHBITS); 363 return hash_mem(rsci->handle.data, rsci->handle.len, RSC_HASHBITS);
364 } 364 }
365 365
366 static int 366 static int
367 rsc_match(struct cache_head *a, struct cache_head *b) 367 rsc_match(struct cache_head *a, struct cache_head *b)
368 { 368 {
369 struct rsc *new = container_of(a, struct rsc, h); 369 struct rsc *new = container_of(a, struct rsc, h);
370 struct rsc *tmp = container_of(b, struct rsc, h); 370 struct rsc *tmp = container_of(b, struct rsc, h);
371 371
372 return netobj_equal(&new->handle, &tmp->handle); 372 return netobj_equal(&new->handle, &tmp->handle);
373 } 373 }
374 374
375 static void 375 static void
376 rsc_init(struct cache_head *cnew, struct cache_head *ctmp) 376 rsc_init(struct cache_head *cnew, struct cache_head *ctmp)
377 { 377 {
378 struct rsc *new = container_of(cnew, struct rsc, h); 378 struct rsc *new = container_of(cnew, struct rsc, h);
379 struct rsc *tmp = container_of(ctmp, struct rsc, h); 379 struct rsc *tmp = container_of(ctmp, struct rsc, h);
380 380
381 new->handle.len = tmp->handle.len; 381 new->handle.len = tmp->handle.len;
382 tmp->handle.len = 0; 382 tmp->handle.len = 0;
383 new->handle.data = tmp->handle.data; 383 new->handle.data = tmp->handle.data;
384 tmp->handle.data = NULL; 384 tmp->handle.data = NULL;
385 new->mechctx = NULL; 385 new->mechctx = NULL;
386 new->cred.cr_group_info = NULL; 386 new->cred.cr_group_info = NULL;
387 new->cred.cr_principal = NULL; 387 new->cred.cr_principal = NULL;
388 } 388 }
389 389
390 static void 390 static void
391 update_rsc(struct cache_head *cnew, struct cache_head *ctmp) 391 update_rsc(struct cache_head *cnew, struct cache_head *ctmp)
392 { 392 {
393 struct rsc *new = container_of(cnew, struct rsc, h); 393 struct rsc *new = container_of(cnew, struct rsc, h);
394 struct rsc *tmp = container_of(ctmp, struct rsc, h); 394 struct rsc *tmp = container_of(ctmp, struct rsc, h);
395 395
396 new->mechctx = tmp->mechctx; 396 new->mechctx = tmp->mechctx;
397 tmp->mechctx = NULL; 397 tmp->mechctx = NULL;
398 memset(&new->seqdata, 0, sizeof(new->seqdata)); 398 memset(&new->seqdata, 0, sizeof(new->seqdata));
399 spin_lock_init(&new->seqdata.sd_lock); 399 spin_lock_init(&new->seqdata.sd_lock);
400 new->cred = tmp->cred; 400 new->cred = tmp->cred;
401 tmp->cred.cr_group_info = NULL; 401 tmp->cred.cr_group_info = NULL;
402 new->cred.cr_principal = tmp->cred.cr_principal; 402 new->cred.cr_principal = tmp->cred.cr_principal;
403 tmp->cred.cr_principal = NULL; 403 tmp->cred.cr_principal = NULL;
404 } 404 }
405 405
406 static struct cache_head * 406 static struct cache_head *
407 rsc_alloc(void) 407 rsc_alloc(void)
408 { 408 {
409 struct rsc *rsci = kmalloc(sizeof(*rsci), GFP_KERNEL); 409 struct rsc *rsci = kmalloc(sizeof(*rsci), GFP_KERNEL);
410 if (rsci) 410 if (rsci)
411 return &rsci->h; 411 return &rsci->h;
412 else 412 else
413 return NULL; 413 return NULL;
414 } 414 }
415 415
416 static int rsc_parse(struct cache_detail *cd, 416 static int rsc_parse(struct cache_detail *cd,
417 char *mesg, int mlen) 417 char *mesg, int mlen)
418 { 418 {
419 /* contexthandle expiry [ uid gid N <n gids> mechname ...mechdata... ] */ 419 /* contexthandle expiry [ uid gid N <n gids> mechname ...mechdata... ] */
420 char *buf = mesg; 420 char *buf = mesg;
421 int id;
421 int len, rv; 422 int len, rv;
422 struct rsc rsci, *rscp = NULL; 423 struct rsc rsci, *rscp = NULL;
423 time_t expiry; 424 time_t expiry;
424 int status = -EINVAL; 425 int status = -EINVAL;
425 struct gss_api_mech *gm = NULL; 426 struct gss_api_mech *gm = NULL;
426 427
427 memset(&rsci, 0, sizeof(rsci)); 428 memset(&rsci, 0, sizeof(rsci));
428 /* context handle */ 429 /* context handle */
429 len = qword_get(&mesg, buf, mlen); 430 len = qword_get(&mesg, buf, mlen);
430 if (len < 0) goto out; 431 if (len < 0) goto out;
431 status = -ENOMEM; 432 status = -ENOMEM;
432 if (dup_to_netobj(&rsci.handle, buf, len)) 433 if (dup_to_netobj(&rsci.handle, buf, len))
433 goto out; 434 goto out;
434 435
435 rsci.h.flags = 0; 436 rsci.h.flags = 0;
436 /* expiry */ 437 /* expiry */
437 expiry = get_expiry(&mesg); 438 expiry = get_expiry(&mesg);
438 status = -EINVAL; 439 status = -EINVAL;
439 if (expiry == 0) 440 if (expiry == 0)
440 goto out; 441 goto out;
441 442
442 rscp = rsc_lookup(cd, &rsci); 443 rscp = rsc_lookup(cd, &rsci);
443 if (!rscp) 444 if (!rscp)
444 goto out; 445 goto out;
445 446
446 /* uid, or NEGATIVE */ 447 /* uid, or NEGATIVE */
447 rv = get_int(&mesg, &rsci.cred.cr_uid); 448 rv = get_int(&mesg, &id);
448 if (rv == -EINVAL) 449 if (rv == -EINVAL)
449 goto out; 450 goto out;
450 if (rv == -ENOENT) 451 if (rv == -ENOENT)
451 set_bit(CACHE_NEGATIVE, &rsci.h.flags); 452 set_bit(CACHE_NEGATIVE, &rsci.h.flags);
452 else { 453 else {
453 int N, i; 454 int N, i;
454 455
456 /* uid */
457 rsci.cred.cr_uid = make_kuid(&init_user_ns, id);
458 if (!uid_valid(rsci.cred.cr_uid))
459 goto out;
460
455 /* gid */ 461 /* gid */
456 if (get_int(&mesg, &rsci.cred.cr_gid)) 462 if (get_int(&mesg, &id))
457 goto out; 463 goto out;
464 rsci.cred.cr_gid = make_kgid(&init_user_ns, id);
465 if (!gid_valid(rsci.cred.cr_gid))
466 goto out;
458 467
459 /* number of additional gid's */ 468 /* number of additional gid's */
460 if (get_int(&mesg, &N)) 469 if (get_int(&mesg, &N))
461 goto out; 470 goto out;
462 status = -ENOMEM; 471 status = -ENOMEM;
463 rsci.cred.cr_group_info = groups_alloc(N); 472 rsci.cred.cr_group_info = groups_alloc(N);
464 if (rsci.cred.cr_group_info == NULL) 473 if (rsci.cred.cr_group_info == NULL)
465 goto out; 474 goto out;
466 475
467 /* gid's */ 476 /* gid's */
468 status = -EINVAL; 477 status = -EINVAL;
469 for (i=0; i<N; i++) { 478 for (i=0; i<N; i++) {
470 gid_t gid;
471 kgid_t kgid; 479 kgid_t kgid;
472 if (get_int(&mesg, &gid)) 480 if (get_int(&mesg, &id))
473 goto out; 481 goto out;
474 kgid = make_kgid(&init_user_ns, gid); 482 kgid = make_kgid(&init_user_ns, id);
475 if (!gid_valid(kgid)) 483 if (!gid_valid(kgid))
476 goto out; 484 goto out;
477 GROUP_AT(rsci.cred.cr_group_info, i) = kgid; 485 GROUP_AT(rsci.cred.cr_group_info, i) = kgid;
478 } 486 }
479 487
480 /* mech name */ 488 /* mech name */
481 len = qword_get(&mesg, buf, mlen); 489 len = qword_get(&mesg, buf, mlen);
482 if (len < 0) 490 if (len < 0)
483 goto out; 491 goto out;
484 gm = gss_mech_get_by_name(buf); 492 gm = gss_mech_get_by_name(buf);
485 status = -EOPNOTSUPP; 493 status = -EOPNOTSUPP;
486 if (!gm) 494 if (!gm)
487 goto out; 495 goto out;
488 496
489 status = -EINVAL; 497 status = -EINVAL;
490 /* mech-specific data: */ 498 /* mech-specific data: */
491 len = qword_get(&mesg, buf, mlen); 499 len = qword_get(&mesg, buf, mlen);
492 if (len < 0) 500 if (len < 0)
493 goto out; 501 goto out;
494 status = gss_import_sec_context(buf, len, gm, &rsci.mechctx, GFP_KERNEL); 502 status = gss_import_sec_context(buf, len, gm, &rsci.mechctx, GFP_KERNEL);
495 if (status) 503 if (status)
496 goto out; 504 goto out;
497 505
498 /* get client name */ 506 /* get client name */
499 len = qword_get(&mesg, buf, mlen); 507 len = qword_get(&mesg, buf, mlen);
500 if (len > 0) { 508 if (len > 0) {
501 rsci.cred.cr_principal = kstrdup(buf, GFP_KERNEL); 509 rsci.cred.cr_principal = kstrdup(buf, GFP_KERNEL);
502 if (!rsci.cred.cr_principal) 510 if (!rsci.cred.cr_principal)
503 goto out; 511 goto out;
504 } 512 }
505 513
506 } 514 }
507 rsci.h.expiry_time = expiry; 515 rsci.h.expiry_time = expiry;
508 rscp = rsc_update(cd, &rsci, rscp); 516 rscp = rsc_update(cd, &rsci, rscp);
509 status = 0; 517 status = 0;
510 out: 518 out:
511 gss_mech_put(gm); 519 gss_mech_put(gm);
512 rsc_free(&rsci); 520 rsc_free(&rsci);
513 if (rscp) 521 if (rscp)
514 cache_put(&rscp->h, cd); 522 cache_put(&rscp->h, cd);
515 else 523 else
516 status = -ENOMEM; 524 status = -ENOMEM;
517 return status; 525 return status;
518 } 526 }
519 527
520 static struct cache_detail rsc_cache_template = { 528 static struct cache_detail rsc_cache_template = {
521 .owner = THIS_MODULE, 529 .owner = THIS_MODULE,
522 .hash_size = RSC_HASHMAX, 530 .hash_size = RSC_HASHMAX,
523 .name = "auth.rpcsec.context", 531 .name = "auth.rpcsec.context",
524 .cache_put = rsc_put, 532 .cache_put = rsc_put,
525 .cache_parse = rsc_parse, 533 .cache_parse = rsc_parse,
526 .match = rsc_match, 534 .match = rsc_match,
527 .init = rsc_init, 535 .init = rsc_init,
528 .update = update_rsc, 536 .update = update_rsc,
529 .alloc = rsc_alloc, 537 .alloc = rsc_alloc,
530 }; 538 };
531 539
532 static struct rsc *rsc_lookup(struct cache_detail *cd, struct rsc *item) 540 static struct rsc *rsc_lookup(struct cache_detail *cd, struct rsc *item)
533 { 541 {
534 struct cache_head *ch; 542 struct cache_head *ch;
535 int hash = rsc_hash(item); 543 int hash = rsc_hash(item);
536 544
537 ch = sunrpc_cache_lookup(cd, &item->h, hash); 545 ch = sunrpc_cache_lookup(cd, &item->h, hash);
538 if (ch) 546 if (ch)
539 return container_of(ch, struct rsc, h); 547 return container_of(ch, struct rsc, h);
540 else 548 else
541 return NULL; 549 return NULL;
542 } 550 }
543 551
544 static struct rsc *rsc_update(struct cache_detail *cd, struct rsc *new, struct rsc *old) 552 static struct rsc *rsc_update(struct cache_detail *cd, struct rsc *new, struct rsc *old)
545 { 553 {
546 struct cache_head *ch; 554 struct cache_head *ch;
547 int hash = rsc_hash(new); 555 int hash = rsc_hash(new);
548 556
549 ch = sunrpc_cache_update(cd, &new->h, 557 ch = sunrpc_cache_update(cd, &new->h,
550 &old->h, hash); 558 &old->h, hash);
551 if (ch) 559 if (ch)
552 return container_of(ch, struct rsc, h); 560 return container_of(ch, struct rsc, h);
553 else 561 else
554 return NULL; 562 return NULL;
555 } 563 }
556 564
557 565
558 static struct rsc * 566 static struct rsc *
559 gss_svc_searchbyctx(struct cache_detail *cd, struct xdr_netobj *handle) 567 gss_svc_searchbyctx(struct cache_detail *cd, struct xdr_netobj *handle)
560 { 568 {
561 struct rsc rsci; 569 struct rsc rsci;
562 struct rsc *found; 570 struct rsc *found;
563 571
564 memset(&rsci, 0, sizeof(rsci)); 572 memset(&rsci, 0, sizeof(rsci));
565 if (dup_to_netobj(&rsci.handle, handle->data, handle->len)) 573 if (dup_to_netobj(&rsci.handle, handle->data, handle->len))
566 return NULL; 574 return NULL;
567 found = rsc_lookup(cd, &rsci); 575 found = rsc_lookup(cd, &rsci);
568 rsc_free(&rsci); 576 rsc_free(&rsci);
569 if (!found) 577 if (!found)
570 return NULL; 578 return NULL;
571 if (cache_check(cd, &found->h, NULL)) 579 if (cache_check(cd, &found->h, NULL))
572 return NULL; 580 return NULL;
573 return found; 581 return found;
574 } 582 }
575 583
576 /* Implements sequence number algorithm as specified in RFC 2203. */ 584 /* Implements sequence number algorithm as specified in RFC 2203. */
577 static int 585 static int
578 gss_check_seq_num(struct rsc *rsci, int seq_num) 586 gss_check_seq_num(struct rsc *rsci, int seq_num)
579 { 587 {
580 struct gss_svc_seq_data *sd = &rsci->seqdata; 588 struct gss_svc_seq_data *sd = &rsci->seqdata;
581 589
582 spin_lock(&sd->sd_lock); 590 spin_lock(&sd->sd_lock);
583 if (seq_num > sd->sd_max) { 591 if (seq_num > sd->sd_max) {
584 if (seq_num >= sd->sd_max + GSS_SEQ_WIN) { 592 if (seq_num >= sd->sd_max + GSS_SEQ_WIN) {
585 memset(sd->sd_win,0,sizeof(sd->sd_win)); 593 memset(sd->sd_win,0,sizeof(sd->sd_win));
586 sd->sd_max = seq_num; 594 sd->sd_max = seq_num;
587 } else while (sd->sd_max < seq_num) { 595 } else while (sd->sd_max < seq_num) {
588 sd->sd_max++; 596 sd->sd_max++;
589 __clear_bit(sd->sd_max % GSS_SEQ_WIN, sd->sd_win); 597 __clear_bit(sd->sd_max % GSS_SEQ_WIN, sd->sd_win);
590 } 598 }
591 __set_bit(seq_num % GSS_SEQ_WIN, sd->sd_win); 599 __set_bit(seq_num % GSS_SEQ_WIN, sd->sd_win);
592 goto ok; 600 goto ok;
593 } else if (seq_num <= sd->sd_max - GSS_SEQ_WIN) { 601 } else if (seq_num <= sd->sd_max - GSS_SEQ_WIN) {
594 goto drop; 602 goto drop;
595 } 603 }
596 /* sd_max - GSS_SEQ_WIN < seq_num <= sd_max */ 604 /* sd_max - GSS_SEQ_WIN < seq_num <= sd_max */
597 if (__test_and_set_bit(seq_num % GSS_SEQ_WIN, sd->sd_win)) 605 if (__test_and_set_bit(seq_num % GSS_SEQ_WIN, sd->sd_win))
598 goto drop; 606 goto drop;
599 ok: 607 ok:
600 spin_unlock(&sd->sd_lock); 608 spin_unlock(&sd->sd_lock);
601 return 1; 609 return 1;
602 drop: 610 drop:
603 spin_unlock(&sd->sd_lock); 611 spin_unlock(&sd->sd_lock);
604 return 0; 612 return 0;
605 } 613 }
606 614
607 static inline u32 round_up_to_quad(u32 i) 615 static inline u32 round_up_to_quad(u32 i)
608 { 616 {
609 return (i + 3 ) & ~3; 617 return (i + 3 ) & ~3;
610 } 618 }
611 619
612 static inline int 620 static inline int
613 svc_safe_getnetobj(struct kvec *argv, struct xdr_netobj *o) 621 svc_safe_getnetobj(struct kvec *argv, struct xdr_netobj *o)
614 { 622 {
615 int l; 623 int l;
616 624
617 if (argv->iov_len < 4) 625 if (argv->iov_len < 4)
618 return -1; 626 return -1;
619 o->len = svc_getnl(argv); 627 o->len = svc_getnl(argv);
620 l = round_up_to_quad(o->len); 628 l = round_up_to_quad(o->len);
621 if (argv->iov_len < l) 629 if (argv->iov_len < l)
622 return -1; 630 return -1;
623 o->data = argv->iov_base; 631 o->data = argv->iov_base;
624 argv->iov_base += l; 632 argv->iov_base += l;
625 argv->iov_len -= l; 633 argv->iov_len -= l;
626 return 0; 634 return 0;
627 } 635 }
628 636
629 static inline int 637 static inline int
630 svc_safe_putnetobj(struct kvec *resv, struct xdr_netobj *o) 638 svc_safe_putnetobj(struct kvec *resv, struct xdr_netobj *o)
631 { 639 {
632 u8 *p; 640 u8 *p;
633 641
634 if (resv->iov_len + 4 > PAGE_SIZE) 642 if (resv->iov_len + 4 > PAGE_SIZE)
635 return -1; 643 return -1;
636 svc_putnl(resv, o->len); 644 svc_putnl(resv, o->len);
637 p = resv->iov_base + resv->iov_len; 645 p = resv->iov_base + resv->iov_len;
638 resv->iov_len += round_up_to_quad(o->len); 646 resv->iov_len += round_up_to_quad(o->len);
639 if (resv->iov_len > PAGE_SIZE) 647 if (resv->iov_len > PAGE_SIZE)
640 return -1; 648 return -1;
641 memcpy(p, o->data, o->len); 649 memcpy(p, o->data, o->len);
642 memset(p + o->len, 0, round_up_to_quad(o->len) - o->len); 650 memset(p + o->len, 0, round_up_to_quad(o->len) - o->len);
643 return 0; 651 return 0;
644 } 652 }
645 653
646 /* 654 /*
647 * Verify the checksum on the header and return SVC_OK on success. 655 * Verify the checksum on the header and return SVC_OK on success.
648 * Otherwise, return SVC_DROP (in the case of a bad sequence number) 656 * Otherwise, return SVC_DROP (in the case of a bad sequence number)
649 * or return SVC_DENIED and indicate error in authp. 657 * or return SVC_DENIED and indicate error in authp.
650 */ 658 */
651 static int 659 static int
652 gss_verify_header(struct svc_rqst *rqstp, struct rsc *rsci, 660 gss_verify_header(struct svc_rqst *rqstp, struct rsc *rsci,
653 __be32 *rpcstart, struct rpc_gss_wire_cred *gc, __be32 *authp) 661 __be32 *rpcstart, struct rpc_gss_wire_cred *gc, __be32 *authp)
654 { 662 {
655 struct gss_ctx *ctx_id = rsci->mechctx; 663 struct gss_ctx *ctx_id = rsci->mechctx;
656 struct xdr_buf rpchdr; 664 struct xdr_buf rpchdr;
657 struct xdr_netobj checksum; 665 struct xdr_netobj checksum;
658 u32 flavor = 0; 666 u32 flavor = 0;
659 struct kvec *argv = &rqstp->rq_arg.head[0]; 667 struct kvec *argv = &rqstp->rq_arg.head[0];
660 struct kvec iov; 668 struct kvec iov;
661 669
662 /* data to compute the checksum over: */ 670 /* data to compute the checksum over: */
663 iov.iov_base = rpcstart; 671 iov.iov_base = rpcstart;
664 iov.iov_len = (u8 *)argv->iov_base - (u8 *)rpcstart; 672 iov.iov_len = (u8 *)argv->iov_base - (u8 *)rpcstart;
665 xdr_buf_from_iov(&iov, &rpchdr); 673 xdr_buf_from_iov(&iov, &rpchdr);
666 674
667 *authp = rpc_autherr_badverf; 675 *authp = rpc_autherr_badverf;
668 if (argv->iov_len < 4) 676 if (argv->iov_len < 4)
669 return SVC_DENIED; 677 return SVC_DENIED;
670 flavor = svc_getnl(argv); 678 flavor = svc_getnl(argv);
671 if (flavor != RPC_AUTH_GSS) 679 if (flavor != RPC_AUTH_GSS)
672 return SVC_DENIED; 680 return SVC_DENIED;
673 if (svc_safe_getnetobj(argv, &checksum)) 681 if (svc_safe_getnetobj(argv, &checksum))
674 return SVC_DENIED; 682 return SVC_DENIED;
675 683
676 if (rqstp->rq_deferred) /* skip verification of revisited request */ 684 if (rqstp->rq_deferred) /* skip verification of revisited request */
677 return SVC_OK; 685 return SVC_OK;
678 if (gss_verify_mic(ctx_id, &rpchdr, &checksum) != GSS_S_COMPLETE) { 686 if (gss_verify_mic(ctx_id, &rpchdr, &checksum) != GSS_S_COMPLETE) {
679 *authp = rpcsec_gsserr_credproblem; 687 *authp = rpcsec_gsserr_credproblem;
680 return SVC_DENIED; 688 return SVC_DENIED;
681 } 689 }
682 690
683 if (gc->gc_seq > MAXSEQ) { 691 if (gc->gc_seq > MAXSEQ) {
684 dprintk("RPC: svcauth_gss: discarding request with " 692 dprintk("RPC: svcauth_gss: discarding request with "
685 "large sequence number %d\n", gc->gc_seq); 693 "large sequence number %d\n", gc->gc_seq);
686 *authp = rpcsec_gsserr_ctxproblem; 694 *authp = rpcsec_gsserr_ctxproblem;
687 return SVC_DENIED; 695 return SVC_DENIED;
688 } 696 }
689 if (!gss_check_seq_num(rsci, gc->gc_seq)) { 697 if (!gss_check_seq_num(rsci, gc->gc_seq)) {
690 dprintk("RPC: svcauth_gss: discarding request with " 698 dprintk("RPC: svcauth_gss: discarding request with "
691 "old sequence number %d\n", gc->gc_seq); 699 "old sequence number %d\n", gc->gc_seq);
692 return SVC_DROP; 700 return SVC_DROP;
693 } 701 }
694 return SVC_OK; 702 return SVC_OK;
695 } 703 }
696 704
697 static int 705 static int
698 gss_write_null_verf(struct svc_rqst *rqstp) 706 gss_write_null_verf(struct svc_rqst *rqstp)
699 { 707 {
700 __be32 *p; 708 __be32 *p;
701 709
702 svc_putnl(rqstp->rq_res.head, RPC_AUTH_NULL); 710 svc_putnl(rqstp->rq_res.head, RPC_AUTH_NULL);
703 p = rqstp->rq_res.head->iov_base + rqstp->rq_res.head->iov_len; 711 p = rqstp->rq_res.head->iov_base + rqstp->rq_res.head->iov_len;
704 /* don't really need to check if head->iov_len > PAGE_SIZE ... */ 712 /* don't really need to check if head->iov_len > PAGE_SIZE ... */
705 *p++ = 0; 713 *p++ = 0;
706 if (!xdr_ressize_check(rqstp, p)) 714 if (!xdr_ressize_check(rqstp, p))
707 return -1; 715 return -1;
708 return 0; 716 return 0;
709 } 717 }
710 718
711 static int 719 static int
712 gss_write_verf(struct svc_rqst *rqstp, struct gss_ctx *ctx_id, u32 seq) 720 gss_write_verf(struct svc_rqst *rqstp, struct gss_ctx *ctx_id, u32 seq)
713 { 721 {
714 __be32 xdr_seq; 722 __be32 xdr_seq;
715 u32 maj_stat; 723 u32 maj_stat;
716 struct xdr_buf verf_data; 724 struct xdr_buf verf_data;
717 struct xdr_netobj mic; 725 struct xdr_netobj mic;
718 __be32 *p; 726 __be32 *p;
719 struct kvec iov; 727 struct kvec iov;
720 728
721 svc_putnl(rqstp->rq_res.head, RPC_AUTH_GSS); 729 svc_putnl(rqstp->rq_res.head, RPC_AUTH_GSS);
722 xdr_seq = htonl(seq); 730 xdr_seq = htonl(seq);
723 731
724 iov.iov_base = &xdr_seq; 732 iov.iov_base = &xdr_seq;
725 iov.iov_len = sizeof(xdr_seq); 733 iov.iov_len = sizeof(xdr_seq);
726 xdr_buf_from_iov(&iov, &verf_data); 734 xdr_buf_from_iov(&iov, &verf_data);
727 p = rqstp->rq_res.head->iov_base + rqstp->rq_res.head->iov_len; 735 p = rqstp->rq_res.head->iov_base + rqstp->rq_res.head->iov_len;
728 mic.data = (u8 *)(p + 1); 736 mic.data = (u8 *)(p + 1);
729 maj_stat = gss_get_mic(ctx_id, &verf_data, &mic); 737 maj_stat = gss_get_mic(ctx_id, &verf_data, &mic);
730 if (maj_stat != GSS_S_COMPLETE) 738 if (maj_stat != GSS_S_COMPLETE)
731 return -1; 739 return -1;
732 *p++ = htonl(mic.len); 740 *p++ = htonl(mic.len);
733 memset((u8 *)p + mic.len, 0, round_up_to_quad(mic.len) - mic.len); 741 memset((u8 *)p + mic.len, 0, round_up_to_quad(mic.len) - mic.len);
734 p += XDR_QUADLEN(mic.len); 742 p += XDR_QUADLEN(mic.len);
735 if (!xdr_ressize_check(rqstp, p)) 743 if (!xdr_ressize_check(rqstp, p))
736 return -1; 744 return -1;
737 return 0; 745 return 0;
738 } 746 }
739 747
740 struct gss_domain { 748 struct gss_domain {
741 struct auth_domain h; 749 struct auth_domain h;
742 u32 pseudoflavor; 750 u32 pseudoflavor;
743 }; 751 };
744 752
745 static struct auth_domain * 753 static struct auth_domain *
746 find_gss_auth_domain(struct gss_ctx *ctx, u32 svc) 754 find_gss_auth_domain(struct gss_ctx *ctx, u32 svc)
747 { 755 {
748 char *name; 756 char *name;
749 757
750 name = gss_service_to_auth_domain_name(ctx->mech_type, svc); 758 name = gss_service_to_auth_domain_name(ctx->mech_type, svc);
751 if (!name) 759 if (!name)
752 return NULL; 760 return NULL;
753 return auth_domain_find(name); 761 return auth_domain_find(name);
754 } 762 }
755 763
756 static struct auth_ops svcauthops_gss; 764 static struct auth_ops svcauthops_gss;
757 765
758 u32 svcauth_gss_flavor(struct auth_domain *dom) 766 u32 svcauth_gss_flavor(struct auth_domain *dom)
759 { 767 {
760 struct gss_domain *gd = container_of(dom, struct gss_domain, h); 768 struct gss_domain *gd = container_of(dom, struct gss_domain, h);
761 769
762 return gd->pseudoflavor; 770 return gd->pseudoflavor;
763 } 771 }
764 772
765 EXPORT_SYMBOL_GPL(svcauth_gss_flavor); 773 EXPORT_SYMBOL_GPL(svcauth_gss_flavor);
766 774
767 int 775 int
768 svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) 776 svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name)
769 { 777 {
770 struct gss_domain *new; 778 struct gss_domain *new;
771 struct auth_domain *test; 779 struct auth_domain *test;
772 int stat = -ENOMEM; 780 int stat = -ENOMEM;
773 781
774 new = kmalloc(sizeof(*new), GFP_KERNEL); 782 new = kmalloc(sizeof(*new), GFP_KERNEL);
775 if (!new) 783 if (!new)
776 goto out; 784 goto out;
777 kref_init(&new->h.ref); 785 kref_init(&new->h.ref);
778 new->h.name = kstrdup(name, GFP_KERNEL); 786 new->h.name = kstrdup(name, GFP_KERNEL);
779 if (!new->h.name) 787 if (!new->h.name)
780 goto out_free_dom; 788 goto out_free_dom;
781 new->h.flavour = &svcauthops_gss; 789 new->h.flavour = &svcauthops_gss;
782 new->pseudoflavor = pseudoflavor; 790 new->pseudoflavor = pseudoflavor;
783 791
784 stat = 0; 792 stat = 0;
785 test = auth_domain_lookup(name, &new->h); 793 test = auth_domain_lookup(name, &new->h);
786 if (test != &new->h) { /* Duplicate registration */ 794 if (test != &new->h) { /* Duplicate registration */
787 auth_domain_put(test); 795 auth_domain_put(test);
788 kfree(new->h.name); 796 kfree(new->h.name);
789 goto out_free_dom; 797 goto out_free_dom;
790 } 798 }
791 return 0; 799 return 0;
792 800
793 out_free_dom: 801 out_free_dom:
794 kfree(new); 802 kfree(new);
795 out: 803 out:
796 return stat; 804 return stat;
797 } 805 }
798 806
799 EXPORT_SYMBOL_GPL(svcauth_gss_register_pseudoflavor); 807 EXPORT_SYMBOL_GPL(svcauth_gss_register_pseudoflavor);
800 808
801 static inline int 809 static inline int
802 read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj) 810 read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj)
803 { 811 {
804 __be32 raw; 812 __be32 raw;
805 int status; 813 int status;
806 814
807 status = read_bytes_from_xdr_buf(buf, base, &raw, sizeof(*obj)); 815 status = read_bytes_from_xdr_buf(buf, base, &raw, sizeof(*obj));
808 if (status) 816 if (status)
809 return status; 817 return status;
810 *obj = ntohl(raw); 818 *obj = ntohl(raw);
811 return 0; 819 return 0;
812 } 820 }
813 821
814 /* It would be nice if this bit of code could be shared with the client. 822 /* It would be nice if this bit of code could be shared with the client.
815 * Obstacles: 823 * Obstacles:
816 * The client shouldn't malloc(), would have to pass in own memory. 824 * The client shouldn't malloc(), would have to pass in own memory.
817 * The server uses base of head iovec as read pointer, while the 825 * The server uses base of head iovec as read pointer, while the
818 * client uses separate pointer. */ 826 * client uses separate pointer. */
819 static int 827 static int
820 unwrap_integ_data(struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx) 828 unwrap_integ_data(struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx)
821 { 829 {
822 int stat = -EINVAL; 830 int stat = -EINVAL;
823 u32 integ_len, maj_stat; 831 u32 integ_len, maj_stat;
824 struct xdr_netobj mic; 832 struct xdr_netobj mic;
825 struct xdr_buf integ_buf; 833 struct xdr_buf integ_buf;
826 834
827 integ_len = svc_getnl(&buf->head[0]); 835 integ_len = svc_getnl(&buf->head[0]);
828 if (integ_len & 3) 836 if (integ_len & 3)
829 return stat; 837 return stat;
830 if (integ_len > buf->len) 838 if (integ_len > buf->len)
831 return stat; 839 return stat;
832 if (xdr_buf_subsegment(buf, &integ_buf, 0, integ_len)) 840 if (xdr_buf_subsegment(buf, &integ_buf, 0, integ_len))
833 BUG(); 841 BUG();
834 /* copy out mic... */ 842 /* copy out mic... */
835 if (read_u32_from_xdr_buf(buf, integ_len, &mic.len)) 843 if (read_u32_from_xdr_buf(buf, integ_len, &mic.len))
836 BUG(); 844 BUG();
837 if (mic.len > RPC_MAX_AUTH_SIZE) 845 if (mic.len > RPC_MAX_AUTH_SIZE)
838 return stat; 846 return stat;
839 mic.data = kmalloc(mic.len, GFP_KERNEL); 847 mic.data = kmalloc(mic.len, GFP_KERNEL);
840 if (!mic.data) 848 if (!mic.data)
841 return stat; 849 return stat;
842 if (read_bytes_from_xdr_buf(buf, integ_len + 4, mic.data, mic.len)) 850 if (read_bytes_from_xdr_buf(buf, integ_len + 4, mic.data, mic.len))
843 goto out; 851 goto out;
844 maj_stat = gss_verify_mic(ctx, &integ_buf, &mic); 852 maj_stat = gss_verify_mic(ctx, &integ_buf, &mic);
845 if (maj_stat != GSS_S_COMPLETE) 853 if (maj_stat != GSS_S_COMPLETE)
846 goto out; 854 goto out;
847 if (svc_getnl(&buf->head[0]) != seq) 855 if (svc_getnl(&buf->head[0]) != seq)
848 goto out; 856 goto out;
849 stat = 0; 857 stat = 0;
850 out: 858 out:
851 kfree(mic.data); 859 kfree(mic.data);
852 return stat; 860 return stat;
853 } 861 }
854 862
855 static inline int 863 static inline int
856 total_buf_len(struct xdr_buf *buf) 864 total_buf_len(struct xdr_buf *buf)
857 { 865 {
858 return buf->head[0].iov_len + buf->page_len + buf->tail[0].iov_len; 866 return buf->head[0].iov_len + buf->page_len + buf->tail[0].iov_len;
859 } 867 }
860 868
861 static void 869 static void
862 fix_priv_head(struct xdr_buf *buf, int pad) 870 fix_priv_head(struct xdr_buf *buf, int pad)
863 { 871 {
864 if (buf->page_len == 0) { 872 if (buf->page_len == 0) {
865 /* We need to adjust head and buf->len in tandem in this 873 /* We need to adjust head and buf->len in tandem in this
866 * case to make svc_defer() work--it finds the original 874 * case to make svc_defer() work--it finds the original
867 * buffer start using buf->len - buf->head[0].iov_len. */ 875 * buffer start using buf->len - buf->head[0].iov_len. */
868 buf->head[0].iov_len -= pad; 876 buf->head[0].iov_len -= pad;
869 } 877 }
870 } 878 }
871 879
872 static int 880 static int
873 unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx) 881 unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx)
874 { 882 {
875 u32 priv_len, maj_stat; 883 u32 priv_len, maj_stat;
876 int pad, saved_len, remaining_len, offset; 884 int pad, saved_len, remaining_len, offset;
877 885
878 rqstp->rq_splice_ok = 0; 886 rqstp->rq_splice_ok = 0;
879 887
880 priv_len = svc_getnl(&buf->head[0]); 888 priv_len = svc_getnl(&buf->head[0]);
881 if (rqstp->rq_deferred) { 889 if (rqstp->rq_deferred) {
882 /* Already decrypted last time through! The sequence number 890 /* Already decrypted last time through! The sequence number
883 * check at out_seq is unnecessary but harmless: */ 891 * check at out_seq is unnecessary but harmless: */
884 goto out_seq; 892 goto out_seq;
885 } 893 }
886 /* buf->len is the number of bytes from the original start of the 894 /* buf->len is the number of bytes from the original start of the
887 * request to the end, where head[0].iov_len is just the bytes 895 * request to the end, where head[0].iov_len is just the bytes
888 * not yet read from the head, so these two values are different: */ 896 * not yet read from the head, so these two values are different: */
889 remaining_len = total_buf_len(buf); 897 remaining_len = total_buf_len(buf);
890 if (priv_len > remaining_len) 898 if (priv_len > remaining_len)
891 return -EINVAL; 899 return -EINVAL;
892 pad = remaining_len - priv_len; 900 pad = remaining_len - priv_len;
893 buf->len -= pad; 901 buf->len -= pad;
894 fix_priv_head(buf, pad); 902 fix_priv_head(buf, pad);
895 903
896 /* Maybe it would be better to give gss_unwrap a length parameter: */ 904 /* Maybe it would be better to give gss_unwrap a length parameter: */
897 saved_len = buf->len; 905 saved_len = buf->len;
898 buf->len = priv_len; 906 buf->len = priv_len;
899 maj_stat = gss_unwrap(ctx, 0, buf); 907 maj_stat = gss_unwrap(ctx, 0, buf);
900 pad = priv_len - buf->len; 908 pad = priv_len - buf->len;
901 buf->len = saved_len; 909 buf->len = saved_len;
902 buf->len -= pad; 910 buf->len -= pad;
903 /* The upper layers assume the buffer is aligned on 4-byte boundaries. 911 /* The upper layers assume the buffer is aligned on 4-byte boundaries.
904 * In the krb5p case, at least, the data ends up offset, so we need to 912 * In the krb5p case, at least, the data ends up offset, so we need to
905 * move it around. */ 913 * move it around. */
906 /* XXX: This is very inefficient. It would be better to either do 914 /* XXX: This is very inefficient. It would be better to either do
907 * this while we encrypt, or maybe in the receive code, if we can peak 915 * this while we encrypt, or maybe in the receive code, if we can peak
908 * ahead and work out the service and mechanism there. */ 916 * ahead and work out the service and mechanism there. */
909 offset = buf->head[0].iov_len % 4; 917 offset = buf->head[0].iov_len % 4;
910 if (offset) { 918 if (offset) {
911 buf->buflen = RPCSVC_MAXPAYLOAD; 919 buf->buflen = RPCSVC_MAXPAYLOAD;
912 xdr_shift_buf(buf, offset); 920 xdr_shift_buf(buf, offset);
913 fix_priv_head(buf, pad); 921 fix_priv_head(buf, pad);
914 } 922 }
915 if (maj_stat != GSS_S_COMPLETE) 923 if (maj_stat != GSS_S_COMPLETE)
916 return -EINVAL; 924 return -EINVAL;
917 out_seq: 925 out_seq:
918 if (svc_getnl(&buf->head[0]) != seq) 926 if (svc_getnl(&buf->head[0]) != seq)
919 return -EINVAL; 927 return -EINVAL;
920 return 0; 928 return 0;
921 } 929 }
922 930
923 struct gss_svc_data { 931 struct gss_svc_data {
924 /* decoded gss client cred: */ 932 /* decoded gss client cred: */
925 struct rpc_gss_wire_cred clcred; 933 struct rpc_gss_wire_cred clcred;
926 /* save a pointer to the beginning of the encoded verifier, 934 /* save a pointer to the beginning of the encoded verifier,
927 * for use in encryption/checksumming in svcauth_gss_release: */ 935 * for use in encryption/checksumming in svcauth_gss_release: */
928 __be32 *verf_start; 936 __be32 *verf_start;
929 struct rsc *rsci; 937 struct rsc *rsci;
930 }; 938 };
931 939
932 static int 940 static int
933 svcauth_gss_set_client(struct svc_rqst *rqstp) 941 svcauth_gss_set_client(struct svc_rqst *rqstp)
934 { 942 {
935 struct gss_svc_data *svcdata = rqstp->rq_auth_data; 943 struct gss_svc_data *svcdata = rqstp->rq_auth_data;
936 struct rsc *rsci = svcdata->rsci; 944 struct rsc *rsci = svcdata->rsci;
937 struct rpc_gss_wire_cred *gc = &svcdata->clcred; 945 struct rpc_gss_wire_cred *gc = &svcdata->clcred;
938 int stat; 946 int stat;
939 947
940 /* 948 /*
941 * A gss export can be specified either by: 949 * A gss export can be specified either by:
942 * export *(sec=krb5,rw) 950 * export *(sec=krb5,rw)
943 * or by 951 * or by
944 * export gss/krb5(rw) 952 * export gss/krb5(rw)
945 * The latter is deprecated; but for backwards compatibility reasons 953 * The latter is deprecated; but for backwards compatibility reasons
946 * the nfsd code will still fall back on trying it if the former 954 * the nfsd code will still fall back on trying it if the former
947 * doesn't work; so we try to make both available to nfsd, below. 955 * doesn't work; so we try to make both available to nfsd, below.
948 */ 956 */
949 rqstp->rq_gssclient = find_gss_auth_domain(rsci->mechctx, gc->gc_svc); 957 rqstp->rq_gssclient = find_gss_auth_domain(rsci->mechctx, gc->gc_svc);
950 if (rqstp->rq_gssclient == NULL) 958 if (rqstp->rq_gssclient == NULL)
951 return SVC_DENIED; 959 return SVC_DENIED;
952 stat = svcauth_unix_set_client(rqstp); 960 stat = svcauth_unix_set_client(rqstp);
953 if (stat == SVC_DROP || stat == SVC_CLOSE) 961 if (stat == SVC_DROP || stat == SVC_CLOSE)
954 return stat; 962 return stat;
955 return SVC_OK; 963 return SVC_OK;
956 } 964 }
957 965
958 static inline int 966 static inline int
959 gss_write_init_verf(struct cache_detail *cd, struct svc_rqst *rqstp, 967 gss_write_init_verf(struct cache_detail *cd, struct svc_rqst *rqstp,
960 struct xdr_netobj *out_handle, int *major_status) 968 struct xdr_netobj *out_handle, int *major_status)
961 { 969 {
962 struct rsc *rsci; 970 struct rsc *rsci;
963 int rc; 971 int rc;
964 972
965 if (*major_status != GSS_S_COMPLETE) 973 if (*major_status != GSS_S_COMPLETE)
966 return gss_write_null_verf(rqstp); 974 return gss_write_null_verf(rqstp);
967 rsci = gss_svc_searchbyctx(cd, out_handle); 975 rsci = gss_svc_searchbyctx(cd, out_handle);
968 if (rsci == NULL) { 976 if (rsci == NULL) {
969 *major_status = GSS_S_NO_CONTEXT; 977 *major_status = GSS_S_NO_CONTEXT;
970 return gss_write_null_verf(rqstp); 978 return gss_write_null_verf(rqstp);
971 } 979 }
972 rc = gss_write_verf(rqstp, rsci->mechctx, GSS_SEQ_WIN); 980 rc = gss_write_verf(rqstp, rsci->mechctx, GSS_SEQ_WIN);
973 cache_put(&rsci->h, cd); 981 cache_put(&rsci->h, cd);
974 return rc; 982 return rc;
975 } 983 }
976 984
977 static inline int 985 static inline int
978 gss_read_verf(struct rpc_gss_wire_cred *gc, 986 gss_read_verf(struct rpc_gss_wire_cred *gc,
979 struct kvec *argv, __be32 *authp, 987 struct kvec *argv, __be32 *authp,
980 struct xdr_netobj *in_handle, 988 struct xdr_netobj *in_handle,
981 struct xdr_netobj *in_token) 989 struct xdr_netobj *in_token)
982 { 990 {
983 struct xdr_netobj tmpobj; 991 struct xdr_netobj tmpobj;
984 992
985 /* Read the verifier; should be NULL: */ 993 /* Read the verifier; should be NULL: */
986 *authp = rpc_autherr_badverf; 994 *authp = rpc_autherr_badverf;
987 if (argv->iov_len < 2 * 4) 995 if (argv->iov_len < 2 * 4)
988 return SVC_DENIED; 996 return SVC_DENIED;
989 if (svc_getnl(argv) != RPC_AUTH_NULL) 997 if (svc_getnl(argv) != RPC_AUTH_NULL)
990 return SVC_DENIED; 998 return SVC_DENIED;
991 if (svc_getnl(argv) != 0) 999 if (svc_getnl(argv) != 0)
992 return SVC_DENIED; 1000 return SVC_DENIED;
993 /* Martial context handle and token for upcall: */ 1001 /* Martial context handle and token for upcall: */
994 *authp = rpc_autherr_badcred; 1002 *authp = rpc_autherr_badcred;
995 if (gc->gc_proc == RPC_GSS_PROC_INIT && gc->gc_ctx.len != 0) 1003 if (gc->gc_proc == RPC_GSS_PROC_INIT && gc->gc_ctx.len != 0)
996 return SVC_DENIED; 1004 return SVC_DENIED;
997 if (dup_netobj(in_handle, &gc->gc_ctx)) 1005 if (dup_netobj(in_handle, &gc->gc_ctx))
998 return SVC_CLOSE; 1006 return SVC_CLOSE;
999 *authp = rpc_autherr_badverf; 1007 *authp = rpc_autherr_badverf;
1000 if (svc_safe_getnetobj(argv, &tmpobj)) { 1008 if (svc_safe_getnetobj(argv, &tmpobj)) {
1001 kfree(in_handle->data); 1009 kfree(in_handle->data);
1002 return SVC_DENIED; 1010 return SVC_DENIED;
1003 } 1011 }
1004 if (dup_netobj(in_token, &tmpobj)) { 1012 if (dup_netobj(in_token, &tmpobj)) {
1005 kfree(in_handle->data); 1013 kfree(in_handle->data);
1006 return SVC_CLOSE; 1014 return SVC_CLOSE;
1007 } 1015 }
1008 1016
1009 return 0; 1017 return 0;
1010 } 1018 }
1011 1019
1012 static inline int 1020 static inline int
1013 gss_write_resv(struct kvec *resv, size_t size_limit, 1021 gss_write_resv(struct kvec *resv, size_t size_limit,
1014 struct xdr_netobj *out_handle, struct xdr_netobj *out_token, 1022 struct xdr_netobj *out_handle, struct xdr_netobj *out_token,
1015 int major_status, int minor_status) 1023 int major_status, int minor_status)
1016 { 1024 {
1017 if (resv->iov_len + 4 > size_limit) 1025 if (resv->iov_len + 4 > size_limit)
1018 return -1; 1026 return -1;
1019 svc_putnl(resv, RPC_SUCCESS); 1027 svc_putnl(resv, RPC_SUCCESS);
1020 if (svc_safe_putnetobj(resv, out_handle)) 1028 if (svc_safe_putnetobj(resv, out_handle))
1021 return -1; 1029 return -1;
1022 if (resv->iov_len + 3 * 4 > size_limit) 1030 if (resv->iov_len + 3 * 4 > size_limit)
1023 return -1; 1031 return -1;
1024 svc_putnl(resv, major_status); 1032 svc_putnl(resv, major_status);
1025 svc_putnl(resv, minor_status); 1033 svc_putnl(resv, minor_status);
1026 svc_putnl(resv, GSS_SEQ_WIN); 1034 svc_putnl(resv, GSS_SEQ_WIN);
1027 if (svc_safe_putnetobj(resv, out_token)) 1035 if (svc_safe_putnetobj(resv, out_token))
1028 return -1; 1036 return -1;
1029 return 0; 1037 return 0;
1030 } 1038 }
1031 1039
1032 /* 1040 /*
1033 * Having read the cred already and found we're in the context 1041 * Having read the cred already and found we're in the context
1034 * initiation case, read the verifier and initiate (or check the results 1042 * initiation case, read the verifier and initiate (or check the results
1035 * of) upcalls to userspace for help with context initiation. If 1043 * of) upcalls to userspace for help with context initiation. If
1036 * the upcall results are available, write the verifier and result. 1044 * the upcall results are available, write the verifier and result.
1037 * Otherwise, drop the request pending an answer to the upcall. 1045 * Otherwise, drop the request pending an answer to the upcall.
1038 */ 1046 */
1039 static int svcauth_gss_handle_init(struct svc_rqst *rqstp, 1047 static int svcauth_gss_handle_init(struct svc_rqst *rqstp,
1040 struct rpc_gss_wire_cred *gc, __be32 *authp) 1048 struct rpc_gss_wire_cred *gc, __be32 *authp)
1041 { 1049 {
1042 struct kvec *argv = &rqstp->rq_arg.head[0]; 1050 struct kvec *argv = &rqstp->rq_arg.head[0];
1043 struct kvec *resv = &rqstp->rq_res.head[0]; 1051 struct kvec *resv = &rqstp->rq_res.head[0];
1044 struct rsi *rsip, rsikey; 1052 struct rsi *rsip, rsikey;
1045 int ret; 1053 int ret;
1046 struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id); 1054 struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);
1047 1055
1048 memset(&rsikey, 0, sizeof(rsikey)); 1056 memset(&rsikey, 0, sizeof(rsikey));
1049 ret = gss_read_verf(gc, argv, authp, 1057 ret = gss_read_verf(gc, argv, authp,
1050 &rsikey.in_handle, &rsikey.in_token); 1058 &rsikey.in_handle, &rsikey.in_token);
1051 if (ret) 1059 if (ret)
1052 return ret; 1060 return ret;
1053 1061
1054 /* Perform upcall, or find upcall result: */ 1062 /* Perform upcall, or find upcall result: */
1055 rsip = rsi_lookup(sn->rsi_cache, &rsikey); 1063 rsip = rsi_lookup(sn->rsi_cache, &rsikey);
1056 rsi_free(&rsikey); 1064 rsi_free(&rsikey);
1057 if (!rsip) 1065 if (!rsip)
1058 return SVC_CLOSE; 1066 return SVC_CLOSE;
1059 if (cache_check(sn->rsi_cache, &rsip->h, &rqstp->rq_chandle) < 0) 1067 if (cache_check(sn->rsi_cache, &rsip->h, &rqstp->rq_chandle) < 0)
1060 /* No upcall result: */ 1068 /* No upcall result: */
1061 return SVC_CLOSE; 1069 return SVC_CLOSE;
1062 1070
1063 ret = SVC_CLOSE; 1071 ret = SVC_CLOSE;
1064 /* Got an answer to the upcall; use it: */ 1072 /* Got an answer to the upcall; use it: */
1065 if (gss_write_init_verf(sn->rsc_cache, rqstp, 1073 if (gss_write_init_verf(sn->rsc_cache, rqstp,
1066 &rsip->out_handle, &rsip->major_status)) 1074 &rsip->out_handle, &rsip->major_status))
1067 goto out; 1075 goto out;
1068 if (gss_write_resv(resv, PAGE_SIZE, 1076 if (gss_write_resv(resv, PAGE_SIZE,
1069 &rsip->out_handle, &rsip->out_token, 1077 &rsip->out_handle, &rsip->out_token,
1070 rsip->major_status, rsip->minor_status)) 1078 rsip->major_status, rsip->minor_status))
1071 goto out; 1079 goto out;
1072 1080
1073 ret = SVC_COMPLETE; 1081 ret = SVC_COMPLETE;
1074 out: 1082 out:
1075 cache_put(&rsip->h, sn->rsi_cache); 1083 cache_put(&rsip->h, sn->rsi_cache);
1076 return ret; 1084 return ret;
1077 } 1085 }
1078 1086
1079 /* 1087 /*
1080 * Accept an rpcsec packet. 1088 * Accept an rpcsec packet.
1081 * If context establishment, punt to user space 1089 * If context establishment, punt to user space
1082 * If data exchange, verify/decrypt 1090 * If data exchange, verify/decrypt
1083 * If context destruction, handle here 1091 * If context destruction, handle here
1084 * In the context establishment and destruction case we encode 1092 * In the context establishment and destruction case we encode
1085 * response here and return SVC_COMPLETE. 1093 * response here and return SVC_COMPLETE.
1086 */ 1094 */
1087 static int 1095 static int
1088 svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp) 1096 svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
1089 { 1097 {
1090 struct kvec *argv = &rqstp->rq_arg.head[0]; 1098 struct kvec *argv = &rqstp->rq_arg.head[0];
1091 struct kvec *resv = &rqstp->rq_res.head[0]; 1099 struct kvec *resv = &rqstp->rq_res.head[0];
1092 u32 crlen; 1100 u32 crlen;
1093 struct gss_svc_data *svcdata = rqstp->rq_auth_data; 1101 struct gss_svc_data *svcdata = rqstp->rq_auth_data;
1094 struct rpc_gss_wire_cred *gc; 1102 struct rpc_gss_wire_cred *gc;
1095 struct rsc *rsci = NULL; 1103 struct rsc *rsci = NULL;
1096 __be32 *rpcstart; 1104 __be32 *rpcstart;
1097 __be32 *reject_stat = resv->iov_base + resv->iov_len; 1105 __be32 *reject_stat = resv->iov_base + resv->iov_len;
1098 int ret; 1106 int ret;
1099 struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id); 1107 struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);
1100 1108
1101 dprintk("RPC: svcauth_gss: argv->iov_len = %zd\n", 1109 dprintk("RPC: svcauth_gss: argv->iov_len = %zd\n",
1102 argv->iov_len); 1110 argv->iov_len);
1103 1111
1104 *authp = rpc_autherr_badcred; 1112 *authp = rpc_autherr_badcred;
1105 if (!svcdata) 1113 if (!svcdata)
1106 svcdata = kmalloc(sizeof(*svcdata), GFP_KERNEL); 1114 svcdata = kmalloc(sizeof(*svcdata), GFP_KERNEL);
1107 if (!svcdata) 1115 if (!svcdata)
1108 goto auth_err; 1116 goto auth_err;
1109 rqstp->rq_auth_data = svcdata; 1117 rqstp->rq_auth_data = svcdata;
1110 svcdata->verf_start = NULL; 1118 svcdata->verf_start = NULL;
1111 svcdata->rsci = NULL; 1119 svcdata->rsci = NULL;
1112 gc = &svcdata->clcred; 1120 gc = &svcdata->clcred;
1113 1121
1114 /* start of rpc packet is 7 u32's back from here: 1122 /* start of rpc packet is 7 u32's back from here:
1115 * xid direction rpcversion prog vers proc flavour 1123 * xid direction rpcversion prog vers proc flavour
1116 */ 1124 */
1117 rpcstart = argv->iov_base; 1125 rpcstart = argv->iov_base;
1118 rpcstart -= 7; 1126 rpcstart -= 7;
1119 1127
1120 /* credential is: 1128 /* credential is:
1121 * version(==1), proc(0,1,2,3), seq, service (1,2,3), handle 1129 * version(==1), proc(0,1,2,3), seq, service (1,2,3), handle
1122 * at least 5 u32s, and is preceded by length, so that makes 6. 1130 * at least 5 u32s, and is preceded by length, so that makes 6.
1123 */ 1131 */
1124 1132
1125 if (argv->iov_len < 5 * 4) 1133 if (argv->iov_len < 5 * 4)
1126 goto auth_err; 1134 goto auth_err;
1127 crlen = svc_getnl(argv); 1135 crlen = svc_getnl(argv);
1128 if (svc_getnl(argv) != RPC_GSS_VERSION) 1136 if (svc_getnl(argv) != RPC_GSS_VERSION)
1129 goto auth_err; 1137 goto auth_err;
1130 gc->gc_proc = svc_getnl(argv); 1138 gc->gc_proc = svc_getnl(argv);
1131 gc->gc_seq = svc_getnl(argv); 1139 gc->gc_seq = svc_getnl(argv);
1132 gc->gc_svc = svc_getnl(argv); 1140 gc->gc_svc = svc_getnl(argv);
1133 if (svc_safe_getnetobj(argv, &gc->gc_ctx)) 1141 if (svc_safe_getnetobj(argv, &gc->gc_ctx))
1134 goto auth_err; 1142 goto auth_err;
1135 if (crlen != round_up_to_quad(gc->gc_ctx.len) + 5 * 4) 1143 if (crlen != round_up_to_quad(gc->gc_ctx.len) + 5 * 4)
1136 goto auth_err; 1144 goto auth_err;
1137 1145
1138 if ((gc->gc_proc != RPC_GSS_PROC_DATA) && (rqstp->rq_proc != 0)) 1146 if ((gc->gc_proc != RPC_GSS_PROC_DATA) && (rqstp->rq_proc != 0))
1139 goto auth_err; 1147 goto auth_err;
1140 1148
1141 *authp = rpc_autherr_badverf; 1149 *authp = rpc_autherr_badverf;
1142 switch (gc->gc_proc) { 1150 switch (gc->gc_proc) {
1143 case RPC_GSS_PROC_INIT: 1151 case RPC_GSS_PROC_INIT:
1144 case RPC_GSS_PROC_CONTINUE_INIT: 1152 case RPC_GSS_PROC_CONTINUE_INIT:
1145 return svcauth_gss_handle_init(rqstp, gc, authp); 1153 return svcauth_gss_handle_init(rqstp, gc, authp);
1146 case RPC_GSS_PROC_DATA: 1154 case RPC_GSS_PROC_DATA:
1147 case RPC_GSS_PROC_DESTROY: 1155 case RPC_GSS_PROC_DESTROY:
1148 /* Look up the context, and check the verifier: */ 1156 /* Look up the context, and check the verifier: */
1149 *authp = rpcsec_gsserr_credproblem; 1157 *authp = rpcsec_gsserr_credproblem;
1150 rsci = gss_svc_searchbyctx(sn->rsc_cache, &gc->gc_ctx); 1158 rsci = gss_svc_searchbyctx(sn->rsc_cache, &gc->gc_ctx);
1151 if (!rsci) 1159 if (!rsci)
1152 goto auth_err; 1160 goto auth_err;
1153 switch (gss_verify_header(rqstp, rsci, rpcstart, gc, authp)) { 1161 switch (gss_verify_header(rqstp, rsci, rpcstart, gc, authp)) {
1154 case SVC_OK: 1162 case SVC_OK:
1155 break; 1163 break;
1156 case SVC_DENIED: 1164 case SVC_DENIED:
1157 goto auth_err; 1165 goto auth_err;
1158 case SVC_DROP: 1166 case SVC_DROP:
1159 goto drop; 1167 goto drop;
1160 } 1168 }
1161 break; 1169 break;
1162 default: 1170 default:
1163 *authp = rpc_autherr_rejectedcred; 1171 *authp = rpc_autherr_rejectedcred;
1164 goto auth_err; 1172 goto auth_err;
1165 } 1173 }
1166 1174
1167 /* now act upon the command: */ 1175 /* now act upon the command: */
1168 switch (gc->gc_proc) { 1176 switch (gc->gc_proc) {
1169 case RPC_GSS_PROC_DESTROY: 1177 case RPC_GSS_PROC_DESTROY:
1170 if (gss_write_verf(rqstp, rsci->mechctx, gc->gc_seq)) 1178 if (gss_write_verf(rqstp, rsci->mechctx, gc->gc_seq))
1171 goto auth_err; 1179 goto auth_err;
1172 rsci->h.expiry_time = get_seconds(); 1180 rsci->h.expiry_time = get_seconds();
1173 set_bit(CACHE_NEGATIVE, &rsci->h.flags); 1181 set_bit(CACHE_NEGATIVE, &rsci->h.flags);
1174 if (resv->iov_len + 4 > PAGE_SIZE) 1182 if (resv->iov_len + 4 > PAGE_SIZE)
1175 goto drop; 1183 goto drop;
1176 svc_putnl(resv, RPC_SUCCESS); 1184 svc_putnl(resv, RPC_SUCCESS);
1177 goto complete; 1185 goto complete;
1178 case RPC_GSS_PROC_DATA: 1186 case RPC_GSS_PROC_DATA:
1179 *authp = rpcsec_gsserr_ctxproblem; 1187 *authp = rpcsec_gsserr_ctxproblem;
1180 svcdata->verf_start = resv->iov_base + resv->iov_len; 1188 svcdata->verf_start = resv->iov_base + resv->iov_len;
1181 if (gss_write_verf(rqstp, rsci->mechctx, gc->gc_seq)) 1189 if (gss_write_verf(rqstp, rsci->mechctx, gc->gc_seq))
1182 goto auth_err; 1190 goto auth_err;
1183 rqstp->rq_cred = rsci->cred; 1191 rqstp->rq_cred = rsci->cred;
1184 get_group_info(rsci->cred.cr_group_info); 1192 get_group_info(rsci->cred.cr_group_info);
1185 *authp = rpc_autherr_badcred; 1193 *authp = rpc_autherr_badcred;
1186 switch (gc->gc_svc) { 1194 switch (gc->gc_svc) {
1187 case RPC_GSS_SVC_NONE: 1195 case RPC_GSS_SVC_NONE:
1188 break; 1196 break;
1189 case RPC_GSS_SVC_INTEGRITY: 1197 case RPC_GSS_SVC_INTEGRITY:
1190 /* placeholders for length and seq. number: */ 1198 /* placeholders for length and seq. number: */
1191 svc_putnl(resv, 0); 1199 svc_putnl(resv, 0);
1192 svc_putnl(resv, 0); 1200 svc_putnl(resv, 0);
1193 if (unwrap_integ_data(&rqstp->rq_arg, 1201 if (unwrap_integ_data(&rqstp->rq_arg,
1194 gc->gc_seq, rsci->mechctx)) 1202 gc->gc_seq, rsci->mechctx))
1195 goto garbage_args; 1203 goto garbage_args;
1196 break; 1204 break;
1197 case RPC_GSS_SVC_PRIVACY: 1205 case RPC_GSS_SVC_PRIVACY:
1198 /* placeholders for length and seq. number: */ 1206 /* placeholders for length and seq. number: */
1199 svc_putnl(resv, 0); 1207 svc_putnl(resv, 0);
1200 svc_putnl(resv, 0); 1208 svc_putnl(resv, 0);
1201 if (unwrap_priv_data(rqstp, &rqstp->rq_arg, 1209 if (unwrap_priv_data(rqstp, &rqstp->rq_arg,
1202 gc->gc_seq, rsci->mechctx)) 1210 gc->gc_seq, rsci->mechctx))
1203 goto garbage_args; 1211 goto garbage_args;
1204 break; 1212 break;
1205 default: 1213 default:
1206 goto auth_err; 1214 goto auth_err;
1207 } 1215 }
1208 svcdata->rsci = rsci; 1216 svcdata->rsci = rsci;
1209 cache_get(&rsci->h); 1217 cache_get(&rsci->h);
1210 rqstp->rq_cred.cr_flavor = gss_svc_to_pseudoflavor( 1218 rqstp->rq_cred.cr_flavor = gss_svc_to_pseudoflavor(
1211 rsci->mechctx->mech_type, gc->gc_svc); 1219 rsci->mechctx->mech_type, gc->gc_svc);
1212 ret = SVC_OK; 1220 ret = SVC_OK;
1213 goto out; 1221 goto out;
1214 } 1222 }
1215 garbage_args: 1223 garbage_args:
1216 ret = SVC_GARBAGE; 1224 ret = SVC_GARBAGE;
1217 goto out; 1225 goto out;
1218 auth_err: 1226 auth_err:
1219 /* Restore write pointer to its original value: */ 1227 /* Restore write pointer to its original value: */
1220 xdr_ressize_check(rqstp, reject_stat); 1228 xdr_ressize_check(rqstp, reject_stat);
1221 ret = SVC_DENIED; 1229 ret = SVC_DENIED;
1222 goto out; 1230 goto out;
1223 complete: 1231 complete:
1224 ret = SVC_COMPLETE; 1232 ret = SVC_COMPLETE;
1225 goto out; 1233 goto out;
1226 drop: 1234 drop:
1227 ret = SVC_DROP; 1235 ret = SVC_DROP;
1228 out: 1236 out:
1229 if (rsci) 1237 if (rsci)
1230 cache_put(&rsci->h, sn->rsc_cache); 1238 cache_put(&rsci->h, sn->rsc_cache);
1231 return ret; 1239 return ret;
1232 } 1240 }
1233 1241
1234 static __be32 * 1242 static __be32 *
1235 svcauth_gss_prepare_to_wrap(struct xdr_buf *resbuf, struct gss_svc_data *gsd) 1243 svcauth_gss_prepare_to_wrap(struct xdr_buf *resbuf, struct gss_svc_data *gsd)
1236 { 1244 {
1237 __be32 *p; 1245 __be32 *p;
1238 u32 verf_len; 1246 u32 verf_len;
1239 1247
1240 p = gsd->verf_start; 1248 p = gsd->verf_start;
1241 gsd->verf_start = NULL; 1249 gsd->verf_start = NULL;
1242 1250
1243 /* If the reply stat is nonzero, don't wrap: */ 1251 /* If the reply stat is nonzero, don't wrap: */
1244 if (*(p-1) != rpc_success) 1252 if (*(p-1) != rpc_success)
1245 return NULL; 1253 return NULL;
1246 /* Skip the verifier: */ 1254 /* Skip the verifier: */
1247 p += 1; 1255 p += 1;
1248 verf_len = ntohl(*p++); 1256 verf_len = ntohl(*p++);
1249 p += XDR_QUADLEN(verf_len); 1257 p += XDR_QUADLEN(verf_len);
1250 /* move accept_stat to right place: */ 1258 /* move accept_stat to right place: */
1251 memcpy(p, p + 2, 4); 1259 memcpy(p, p + 2, 4);
1252 /* Also don't wrap if the accept stat is nonzero: */ 1260 /* Also don't wrap if the accept stat is nonzero: */
1253 if (*p != rpc_success) { 1261 if (*p != rpc_success) {
1254 resbuf->head[0].iov_len -= 2 * 4; 1262 resbuf->head[0].iov_len -= 2 * 4;
1255 return NULL; 1263 return NULL;
1256 } 1264 }
1257 p++; 1265 p++;
1258 return p; 1266 return p;
1259 } 1267 }
1260 1268
1261 static inline int 1269 static inline int
1262 svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp) 1270 svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp)
1263 { 1271 {
1264 struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; 1272 struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data;
1265 struct rpc_gss_wire_cred *gc = &gsd->clcred; 1273 struct rpc_gss_wire_cred *gc = &gsd->clcred;
1266 struct xdr_buf *resbuf = &rqstp->rq_res; 1274 struct xdr_buf *resbuf = &rqstp->rq_res;
1267 struct xdr_buf integ_buf; 1275 struct xdr_buf integ_buf;
1268 struct xdr_netobj mic; 1276 struct xdr_netobj mic;
1269 struct kvec *resv; 1277 struct kvec *resv;
1270 __be32 *p; 1278 __be32 *p;
1271 int integ_offset, integ_len; 1279 int integ_offset, integ_len;
1272 int stat = -EINVAL; 1280 int stat = -EINVAL;
1273 1281
1274 p = svcauth_gss_prepare_to_wrap(resbuf, gsd); 1282 p = svcauth_gss_prepare_to_wrap(resbuf, gsd);
1275 if (p == NULL) 1283 if (p == NULL)
1276 goto out; 1284 goto out;
1277 integ_offset = (u8 *)(p + 1) - (u8 *)resbuf->head[0].iov_base; 1285 integ_offset = (u8 *)(p + 1) - (u8 *)resbuf->head[0].iov_base;
1278 integ_len = resbuf->len - integ_offset; 1286 integ_len = resbuf->len - integ_offset;
1279 BUG_ON(integ_len % 4); 1287 BUG_ON(integ_len % 4);
1280 *p++ = htonl(integ_len); 1288 *p++ = htonl(integ_len);
1281 *p++ = htonl(gc->gc_seq); 1289 *p++ = htonl(gc->gc_seq);
1282 if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, 1290 if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset,
1283 integ_len)) 1291 integ_len))
1284 BUG(); 1292 BUG();
1285 if (resbuf->tail[0].iov_base == NULL) { 1293 if (resbuf->tail[0].iov_base == NULL) {
1286 if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE) 1294 if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE)
1287 goto out_err; 1295 goto out_err;
1288 resbuf->tail[0].iov_base = resbuf->head[0].iov_base 1296 resbuf->tail[0].iov_base = resbuf->head[0].iov_base
1289 + resbuf->head[0].iov_len; 1297 + resbuf->head[0].iov_len;
1290 resbuf->tail[0].iov_len = 0; 1298 resbuf->tail[0].iov_len = 0;
1291 resv = &resbuf->tail[0]; 1299 resv = &resbuf->tail[0];
1292 } else { 1300 } else {
1293 resv = &resbuf->tail[0]; 1301 resv = &resbuf->tail[0];
1294 } 1302 }
1295 mic.data = (u8 *)resv->iov_base + resv->iov_len + 4; 1303 mic.data = (u8 *)resv->iov_base + resv->iov_len + 4;
1296 if (gss_get_mic(gsd->rsci->mechctx, &integ_buf, &mic)) 1304 if (gss_get_mic(gsd->rsci->mechctx, &integ_buf, &mic))
1297 goto out_err; 1305 goto out_err;
1298 svc_putnl(resv, mic.len); 1306 svc_putnl(resv, mic.len);
1299 memset(mic.data + mic.len, 0, 1307 memset(mic.data + mic.len, 0,
1300 round_up_to_quad(mic.len) - mic.len); 1308 round_up_to_quad(mic.len) - mic.len);
1301 resv->iov_len += XDR_QUADLEN(mic.len) << 2; 1309 resv->iov_len += XDR_QUADLEN(mic.len) << 2;
1302 /* not strictly required: */ 1310 /* not strictly required: */
1303 resbuf->len += XDR_QUADLEN(mic.len) << 2; 1311 resbuf->len += XDR_QUADLEN(mic.len) << 2;
1304 BUG_ON(resv->iov_len > PAGE_SIZE); 1312 BUG_ON(resv->iov_len > PAGE_SIZE);
1305 out: 1313 out:
1306 stat = 0; 1314 stat = 0;
1307 out_err: 1315 out_err:
1308 return stat; 1316 return stat;
1309 } 1317 }
1310 1318
1311 static inline int 1319 static inline int
1312 svcauth_gss_wrap_resp_priv(struct svc_rqst *rqstp) 1320 svcauth_gss_wrap_resp_priv(struct svc_rqst *rqstp)
1313 { 1321 {
1314 struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; 1322 struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data;
1315 struct rpc_gss_wire_cred *gc = &gsd->clcred; 1323 struct rpc_gss_wire_cred *gc = &gsd->clcred;
1316 struct xdr_buf *resbuf = &rqstp->rq_res; 1324 struct xdr_buf *resbuf = &rqstp->rq_res;
1317 struct page **inpages = NULL; 1325 struct page **inpages = NULL;
1318 __be32 *p, *len; 1326 __be32 *p, *len;
1319 int offset; 1327 int offset;
1320 int pad; 1328 int pad;
1321 1329
1322 p = svcauth_gss_prepare_to_wrap(resbuf, gsd); 1330 p = svcauth_gss_prepare_to_wrap(resbuf, gsd);
1323 if (p == NULL) 1331 if (p == NULL)
1324 return 0; 1332 return 0;
1325 len = p++; 1333 len = p++;
1326 offset = (u8 *)p - (u8 *)resbuf->head[0].iov_base; 1334 offset = (u8 *)p - (u8 *)resbuf->head[0].iov_base;
1327 *p++ = htonl(gc->gc_seq); 1335 *p++ = htonl(gc->gc_seq);
1328 inpages = resbuf->pages; 1336 inpages = resbuf->pages;
1329 /* XXX: Would be better to write some xdr helper functions for 1337 /* XXX: Would be better to write some xdr helper functions for
1330 * nfs{2,3,4}xdr.c that place the data right, instead of copying: */ 1338 * nfs{2,3,4}xdr.c that place the data right, instead of copying: */
1331 1339
1332 /* 1340 /*
1333 * If there is currently tail data, make sure there is 1341 * If there is currently tail data, make sure there is
1334 * room for the head, tail, and 2 * RPC_MAX_AUTH_SIZE in 1342 * room for the head, tail, and 2 * RPC_MAX_AUTH_SIZE in
1335 * the page, and move the current tail data such that 1343 * the page, and move the current tail data such that
1336 * there is RPC_MAX_AUTH_SIZE slack space available in 1344 * there is RPC_MAX_AUTH_SIZE slack space available in
1337 * both the head and tail. 1345 * both the head and tail.
1338 */ 1346 */
1339 if (resbuf->tail[0].iov_base) { 1347 if (resbuf->tail[0].iov_base) {
1340 BUG_ON(resbuf->tail[0].iov_base >= resbuf->head[0].iov_base 1348 BUG_ON(resbuf->tail[0].iov_base >= resbuf->head[0].iov_base
1341 + PAGE_SIZE); 1349 + PAGE_SIZE);
1342 BUG_ON(resbuf->tail[0].iov_base < resbuf->head[0].iov_base); 1350 BUG_ON(resbuf->tail[0].iov_base < resbuf->head[0].iov_base);
1343 if (resbuf->tail[0].iov_len + resbuf->head[0].iov_len 1351 if (resbuf->tail[0].iov_len + resbuf->head[0].iov_len
1344 + 2 * RPC_MAX_AUTH_SIZE > PAGE_SIZE) 1352 + 2 * RPC_MAX_AUTH_SIZE > PAGE_SIZE)
1345 return -ENOMEM; 1353 return -ENOMEM;
1346 memmove(resbuf->tail[0].iov_base + RPC_MAX_AUTH_SIZE, 1354 memmove(resbuf->tail[0].iov_base + RPC_MAX_AUTH_SIZE,
1347 resbuf->tail[0].iov_base, 1355 resbuf->tail[0].iov_base,
1348 resbuf->tail[0].iov_len); 1356 resbuf->tail[0].iov_len);
1349 resbuf->tail[0].iov_base += RPC_MAX_AUTH_SIZE; 1357 resbuf->tail[0].iov_base += RPC_MAX_AUTH_SIZE;
1350 } 1358 }
1351 /* 1359 /*
1352 * If there is no current tail data, make sure there is 1360 * If there is no current tail data, make sure there is
1353 * room for the head data, and 2 * RPC_MAX_AUTH_SIZE in the 1361 * room for the head data, and 2 * RPC_MAX_AUTH_SIZE in the
1354 * allotted page, and set up tail information such that there 1362 * allotted page, and set up tail information such that there
1355 * is RPC_MAX_AUTH_SIZE slack space available in both the 1363 * is RPC_MAX_AUTH_SIZE slack space available in both the
1356 * head and tail. 1364 * head and tail.
1357 */ 1365 */
1358 if (resbuf->tail[0].iov_base == NULL) { 1366 if (resbuf->tail[0].iov_base == NULL) {
1359 if (resbuf->head[0].iov_len + 2*RPC_MAX_AUTH_SIZE > PAGE_SIZE) 1367 if (resbuf->head[0].iov_len + 2*RPC_MAX_AUTH_SIZE > PAGE_SIZE)
1360 return -ENOMEM; 1368 return -ENOMEM;
1361 resbuf->tail[0].iov_base = resbuf->head[0].iov_base 1369 resbuf->tail[0].iov_base = resbuf->head[0].iov_base
1362 + resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE; 1370 + resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE;
1363 resbuf->tail[0].iov_len = 0; 1371 resbuf->tail[0].iov_len = 0;
1364 } 1372 }
1365 if (gss_wrap(gsd->rsci->mechctx, offset, resbuf, inpages)) 1373 if (gss_wrap(gsd->rsci->mechctx, offset, resbuf, inpages))
1366 return -ENOMEM; 1374 return -ENOMEM;
1367 *len = htonl(resbuf->len - offset); 1375 *len = htonl(resbuf->len - offset);
1368 pad = 3 - ((resbuf->len - offset - 1)&3); 1376 pad = 3 - ((resbuf->len - offset - 1)&3);
1369 p = (__be32 *)(resbuf->tail[0].iov_base + resbuf->tail[0].iov_len); 1377 p = (__be32 *)(resbuf->tail[0].iov_base + resbuf->tail[0].iov_len);
1370 memset(p, 0, pad); 1378 memset(p, 0, pad);
1371 resbuf->tail[0].iov_len += pad; 1379 resbuf->tail[0].iov_len += pad;
1372 resbuf->len += pad; 1380 resbuf->len += pad;
1373 return 0; 1381 return 0;
1374 } 1382 }
1375 1383
1376 static int 1384 static int
1377 svcauth_gss_release(struct svc_rqst *rqstp) 1385 svcauth_gss_release(struct svc_rqst *rqstp)
1378 { 1386 {
1379 struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; 1387 struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data;
1380 struct rpc_gss_wire_cred *gc = &gsd->clcred; 1388 struct rpc_gss_wire_cred *gc = &gsd->clcred;
1381 struct xdr_buf *resbuf = &rqstp->rq_res; 1389 struct xdr_buf *resbuf = &rqstp->rq_res;
1382 int stat = -EINVAL; 1390 int stat = -EINVAL;
1383 struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id); 1391 struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);
1384 1392
1385 if (gc->gc_proc != RPC_GSS_PROC_DATA) 1393 if (gc->gc_proc != RPC_GSS_PROC_DATA)
1386 goto out; 1394 goto out;
1387 /* Release can be called twice, but we only wrap once. */ 1395 /* Release can be called twice, but we only wrap once. */
1388 if (gsd->verf_start == NULL) 1396 if (gsd->verf_start == NULL)
1389 goto out; 1397 goto out;
1390 /* normally not set till svc_send, but we need it here: */ 1398 /* normally not set till svc_send, but we need it here: */
1391 /* XXX: what for? Do we mess it up the moment we call svc_putu32 1399 /* XXX: what for? Do we mess it up the moment we call svc_putu32
1392 * or whatever? */ 1400 * or whatever? */
1393 resbuf->len = total_buf_len(resbuf); 1401 resbuf->len = total_buf_len(resbuf);
1394 switch (gc->gc_svc) { 1402 switch (gc->gc_svc) {
1395 case RPC_GSS_SVC_NONE: 1403 case RPC_GSS_SVC_NONE:
1396 break; 1404 break;
1397 case RPC_GSS_SVC_INTEGRITY: 1405 case RPC_GSS_SVC_INTEGRITY:
1398 stat = svcauth_gss_wrap_resp_integ(rqstp); 1406 stat = svcauth_gss_wrap_resp_integ(rqstp);
1399 if (stat) 1407 if (stat)
1400 goto out_err; 1408 goto out_err;
1401 break; 1409 break;
1402 case RPC_GSS_SVC_PRIVACY: 1410 case RPC_GSS_SVC_PRIVACY:
1403 stat = svcauth_gss_wrap_resp_priv(rqstp); 1411 stat = svcauth_gss_wrap_resp_priv(rqstp);
1404 if (stat) 1412 if (stat)
1405 goto out_err; 1413 goto out_err;
1406 break; 1414 break;
1407 /* 1415 /*
1408 * For any other gc_svc value, svcauth_gss_accept() already set 1416 * For any other gc_svc value, svcauth_gss_accept() already set
1409 * the auth_error appropriately; just fall through: 1417 * the auth_error appropriately; just fall through:
1410 */ 1418 */
1411 } 1419 }
1412 1420
1413 out: 1421 out:
1414 stat = 0; 1422 stat = 0;
1415 out_err: 1423 out_err:
1416 if (rqstp->rq_client) 1424 if (rqstp->rq_client)
1417 auth_domain_put(rqstp->rq_client); 1425 auth_domain_put(rqstp->rq_client);
1418 rqstp->rq_client = NULL; 1426 rqstp->rq_client = NULL;
1419 if (rqstp->rq_gssclient) 1427 if (rqstp->rq_gssclient)
1420 auth_domain_put(rqstp->rq_gssclient); 1428 auth_domain_put(rqstp->rq_gssclient);
1421 rqstp->rq_gssclient = NULL; 1429 rqstp->rq_gssclient = NULL;
1422 if (rqstp->rq_cred.cr_group_info) 1430 if (rqstp->rq_cred.cr_group_info)
1423 put_group_info(rqstp->rq_cred.cr_group_info); 1431 put_group_info(rqstp->rq_cred.cr_group_info);
1424 rqstp->rq_cred.cr_group_info = NULL; 1432 rqstp->rq_cred.cr_group_info = NULL;
1425 if (gsd->rsci) 1433 if (gsd->rsci)
1426 cache_put(&gsd->rsci->h, sn->rsc_cache); 1434 cache_put(&gsd->rsci->h, sn->rsc_cache);
1427 gsd->rsci = NULL; 1435 gsd->rsci = NULL;
1428 1436
1429 return stat; 1437 return stat;
1430 } 1438 }
1431 1439
1432 static void 1440 static void
1433 svcauth_gss_domain_release(struct auth_domain *dom) 1441 svcauth_gss_domain_release(struct auth_domain *dom)
1434 { 1442 {
1435 struct gss_domain *gd = container_of(dom, struct gss_domain, h); 1443 struct gss_domain *gd = container_of(dom, struct gss_domain, h);
1436 1444
1437 kfree(dom->name); 1445 kfree(dom->name);
1438 kfree(gd); 1446 kfree(gd);
1439 } 1447 }
1440 1448
1441 static struct auth_ops svcauthops_gss = { 1449 static struct auth_ops svcauthops_gss = {
1442 .name = "rpcsec_gss", 1450 .name = "rpcsec_gss",
1443 .owner = THIS_MODULE, 1451 .owner = THIS_MODULE,
1444 .flavour = RPC_AUTH_GSS, 1452 .flavour = RPC_AUTH_GSS,
1445 .accept = svcauth_gss_accept, 1453 .accept = svcauth_gss_accept,
1446 .release = svcauth_gss_release, 1454 .release = svcauth_gss_release,
1447 .domain_release = svcauth_gss_domain_release, 1455 .domain_release = svcauth_gss_domain_release,
1448 .set_client = svcauth_gss_set_client, 1456 .set_client = svcauth_gss_set_client,
1449 }; 1457 };
1450 1458
1451 static int rsi_cache_create_net(struct net *net) 1459 static int rsi_cache_create_net(struct net *net)
1452 { 1460 {
1453 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); 1461 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
1454 struct cache_detail *cd; 1462 struct cache_detail *cd;
1455 int err; 1463 int err;
1456 1464
1457 cd = cache_create_net(&rsi_cache_template, net); 1465 cd = cache_create_net(&rsi_cache_template, net);
1458 if (IS_ERR(cd)) 1466 if (IS_ERR(cd))
1459 return PTR_ERR(cd); 1467 return PTR_ERR(cd);
1460 err = cache_register_net(cd, net); 1468 err = cache_register_net(cd, net);
1461 if (err) { 1469 if (err) {
1462 cache_destroy_net(cd, net); 1470 cache_destroy_net(cd, net);
1463 return err; 1471 return err;
1464 } 1472 }
1465 sn->rsi_cache = cd; 1473 sn->rsi_cache = cd;
1466 return 0; 1474 return 0;
1467 } 1475 }
1468 1476
1469 static void rsi_cache_destroy_net(struct net *net) 1477 static void rsi_cache_destroy_net(struct net *net)
1470 { 1478 {
1471 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); 1479 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
1472 struct cache_detail *cd = sn->rsi_cache; 1480 struct cache_detail *cd = sn->rsi_cache;
1473 1481
1474 sn->rsi_cache = NULL; 1482 sn->rsi_cache = NULL;
1475 cache_purge(cd); 1483 cache_purge(cd);
1476 cache_unregister_net(cd, net); 1484 cache_unregister_net(cd, net);
1477 cache_destroy_net(cd, net); 1485 cache_destroy_net(cd, net);
1478 } 1486 }
1479 1487
1480 static int rsc_cache_create_net(struct net *net) 1488 static int rsc_cache_create_net(struct net *net)
1481 { 1489 {
1482 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); 1490 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
1483 struct cache_detail *cd; 1491 struct cache_detail *cd;
1484 int err; 1492 int err;
1485 1493
1486 cd = cache_create_net(&rsc_cache_template, net); 1494 cd = cache_create_net(&rsc_cache_template, net);
1487 if (IS_ERR(cd)) 1495 if (IS_ERR(cd))
1488 return PTR_ERR(cd); 1496 return PTR_ERR(cd);
1489 err = cache_register_net(cd, net); 1497 err = cache_register_net(cd, net);
1490 if (err) { 1498 if (err) {
1491 cache_destroy_net(cd, net); 1499 cache_destroy_net(cd, net);
1492 return err; 1500 return err;
1493 } 1501 }
1494 sn->rsc_cache = cd; 1502 sn->rsc_cache = cd;
1495 return 0; 1503 return 0;
1496 } 1504 }
1497 1505
1498 static void rsc_cache_destroy_net(struct net *net) 1506 static void rsc_cache_destroy_net(struct net *net)
1499 { 1507 {
1500 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); 1508 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
1501 struct cache_detail *cd = sn->rsc_cache; 1509 struct cache_detail *cd = sn->rsc_cache;
1502 1510
1503 sn->rsc_cache = NULL; 1511 sn->rsc_cache = NULL;
1504 cache_purge(cd); 1512 cache_purge(cd);
1505 cache_unregister_net(cd, net); 1513 cache_unregister_net(cd, net);
1506 cache_destroy_net(cd, net); 1514 cache_destroy_net(cd, net);
1507 } 1515 }
1508 1516
1509 int 1517 int
1510 gss_svc_init_net(struct net *net) 1518 gss_svc_init_net(struct net *net)
1511 { 1519 {
1512 int rv; 1520 int rv;
1513 1521
1514 rv = rsc_cache_create_net(net); 1522 rv = rsc_cache_create_net(net);
1515 if (rv) 1523 if (rv)
1516 return rv; 1524 return rv;
1517 rv = rsi_cache_create_net(net); 1525 rv = rsi_cache_create_net(net);
1518 if (rv) 1526 if (rv)
1519 goto out1; 1527 goto out1;
1520 return 0; 1528 return 0;
1521 out1: 1529 out1:
1522 rsc_cache_destroy_net(net); 1530 rsc_cache_destroy_net(net);
1523 return rv; 1531 return rv;
1524 } 1532 }
1525 1533
1526 void 1534 void
1527 gss_svc_shutdown_net(struct net *net) 1535 gss_svc_shutdown_net(struct net *net)
1528 { 1536 {
1529 rsi_cache_destroy_net(net); 1537 rsi_cache_destroy_net(net);
1530 rsc_cache_destroy_net(net); 1538 rsc_cache_destroy_net(net);
1531 } 1539 }
1532 1540
1533 int 1541 int
1534 gss_svc_init(void) 1542 gss_svc_init(void)
1535 { 1543 {
1536 return svc_auth_register(RPC_AUTH_GSS, &svcauthops_gss); 1544 return svc_auth_register(RPC_AUTH_GSS, &svcauthops_gss);
1537 } 1545 }
1538 1546
1539 void 1547 void
1540 gss_svc_shutdown(void) 1548 gss_svc_shutdown(void)
1541 { 1549 {
1542 svc_auth_unregister(RPC_AUTH_GSS); 1550 svc_auth_unregister(RPC_AUTH_GSS);
1543 } 1551 }