1 // SPDX-License-Identifier: GPL-2.0 <<
2 /* 1 /*
3 * NFS exporting and validation. 2 * NFS exporting and validation.
4 * 3 *
5 * We maintain a list of clients, each of whic 4 * We maintain a list of clients, each of which has a list of
6 * exports. To export an fs to a given client, 5 * exports. To export an fs to a given client, you first have
7 * to create the client entry with NFSCTL_ADDC 6 * to create the client entry with NFSCTL_ADDCLIENT, which
8 * creates a client control block and adds it 7 * creates a client control block and adds it to the hash
9 * table. Then, you call NFSCTL_EXPORT for eac 8 * table. Then, you call NFSCTL_EXPORT for each fs.
10 * 9 *
11 * 10 *
12 * Copyright (C) 1995, 1996 Olaf Kirch, <okir@ 11 * Copyright (C) 1995, 1996 Olaf Kirch, <okir@monad.swb.de>
13 */ 12 */
14 13
15 #include <linux/slab.h> 14 #include <linux/slab.h>
16 #include <linux/namei.h> 15 #include <linux/namei.h>
17 #include <linux/module.h> 16 #include <linux/module.h>
18 #include <linux/exportfs.h> 17 #include <linux/exportfs.h>
19 #include <linux/sunrpc/svc_xprt.h> 18 #include <linux/sunrpc/svc_xprt.h>
20 19
21 #include "nfsd.h" 20 #include "nfsd.h"
22 #include "nfsfh.h" 21 #include "nfsfh.h"
23 #include "netns.h" 22 #include "netns.h"
24 #include "pnfs.h" 23 #include "pnfs.h"
25 #include "filecache.h" <<
26 #include "trace.h" <<
27 24
28 #define NFSDDBG_FACILITY NFSDDBG_EXPORT 25 #define NFSDDBG_FACILITY NFSDDBG_EXPORT
29 26
30 /* 27 /*
31 * We have two caches. 28 * We have two caches.
32 * One maps client+vfsmnt+dentry to export opt 29 * One maps client+vfsmnt+dentry to export options - the export map
33 * The other maps client+filehandle-fragment t 30 * The other maps client+filehandle-fragment to export options. - the expkey map
34 * 31 *
35 * The export options are actually stored in t 32 * The export options are actually stored in the first map, and the
36 * second map contains a reference to the entr 33 * second map contains a reference to the entry in the first map.
37 */ 34 */
38 35
39 #define EXPKEY_HASHBITS 8 36 #define EXPKEY_HASHBITS 8
40 #define EXPKEY_HASHMAX (1 << EXPKEY_H 37 #define EXPKEY_HASHMAX (1 << EXPKEY_HASHBITS)
41 #define EXPKEY_HASHMASK (EXPKEY_HASHMA 38 #define EXPKEY_HASHMASK (EXPKEY_HASHMAX -1)
42 39
43 static void expkey_put(struct kref *ref) 40 static void expkey_put(struct kref *ref)
44 { 41 {
45 struct svc_expkey *key = container_of( 42 struct svc_expkey *key = container_of(ref, struct svc_expkey, h.ref);
46 43
47 if (test_bit(CACHE_VALID, &key->h.flag 44 if (test_bit(CACHE_VALID, &key->h.flags) &&
48 !test_bit(CACHE_NEGATIVE, &key->h. 45 !test_bit(CACHE_NEGATIVE, &key->h.flags))
49 path_put(&key->ek_path); 46 path_put(&key->ek_path);
50 auth_domain_put(key->ek_client); 47 auth_domain_put(key->ek_client);
51 kfree_rcu(key, ek_rcu); !! 48 kfree(key);
52 } <<
53 <<
54 static int expkey_upcall(struct cache_detail * <<
55 { <<
56 return sunrpc_cache_pipe_upcall(cd, h) <<
57 } 49 }
58 50
59 static void expkey_request(struct cache_detail 51 static void expkey_request(struct cache_detail *cd,
60 struct cache_head * 52 struct cache_head *h,
61 char **bpp, int *bl 53 char **bpp, int *blen)
62 { 54 {
63 /* client fsidtype \xfsid */ 55 /* client fsidtype \xfsid */
64 struct svc_expkey *ek = container_of(h 56 struct svc_expkey *ek = container_of(h, struct svc_expkey, h);
65 char type[5]; 57 char type[5];
66 58
67 qword_add(bpp, blen, ek->ek_client->na 59 qword_add(bpp, blen, ek->ek_client->name);
68 snprintf(type, 5, "%d", ek->ek_fsidtyp 60 snprintf(type, 5, "%d", ek->ek_fsidtype);
69 qword_add(bpp, blen, type); 61 qword_add(bpp, blen, type);
70 qword_addhex(bpp, blen, (char*)ek->ek_ 62 qword_addhex(bpp, blen, (char*)ek->ek_fsid, key_len(ek->ek_fsidtype));
71 (*bpp)[-1] = '\n'; 63 (*bpp)[-1] = '\n';
72 } 64 }
73 65
74 static struct svc_expkey *svc_expkey_update(st 66 static struct svc_expkey *svc_expkey_update(struct cache_detail *cd, struct svc_expkey *new,
75 st 67 struct svc_expkey *old);
76 static struct svc_expkey *svc_expkey_lookup(st 68 static struct svc_expkey *svc_expkey_lookup(struct cache_detail *cd, struct svc_expkey *);
77 69
78 static int expkey_parse(struct cache_detail *c 70 static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
79 { 71 {
80 /* client fsidtype fsid expiry [path] 72 /* client fsidtype fsid expiry [path] */
81 char *buf; 73 char *buf;
82 int len; 74 int len;
83 struct auth_domain *dom = NULL; 75 struct auth_domain *dom = NULL;
84 int err; 76 int err;
85 int fsidtype; 77 int fsidtype;
86 char *ep; 78 char *ep;
87 struct svc_expkey key; 79 struct svc_expkey key;
88 struct svc_expkey *ek = NULL; 80 struct svc_expkey *ek = NULL;
89 81
90 if (mesg[mlen - 1] != '\n') 82 if (mesg[mlen - 1] != '\n')
91 return -EINVAL; 83 return -EINVAL;
92 mesg[mlen-1] = 0; 84 mesg[mlen-1] = 0;
93 85
94 buf = kmalloc(PAGE_SIZE, GFP_KERNEL); 86 buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
95 err = -ENOMEM; 87 err = -ENOMEM;
96 if (!buf) 88 if (!buf)
97 goto out; 89 goto out;
98 90
99 err = -EINVAL; 91 err = -EINVAL;
100 if (qword_get(&mesg, buf, PAGE_SIZE) < !! 92 if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
101 goto out; 93 goto out;
102 94
103 err = -ENOENT; 95 err = -ENOENT;
104 dom = auth_domain_find(buf); 96 dom = auth_domain_find(buf);
105 if (!dom) 97 if (!dom)
106 goto out; 98 goto out;
107 dprintk("found domain %s\n", buf); 99 dprintk("found domain %s\n", buf);
108 100
109 err = -EINVAL; 101 err = -EINVAL;
110 if (qword_get(&mesg, buf, PAGE_SIZE) < !! 102 if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
111 goto out; 103 goto out;
112 fsidtype = simple_strtoul(buf, &ep, 10 104 fsidtype = simple_strtoul(buf, &ep, 10);
113 if (*ep) 105 if (*ep)
114 goto out; 106 goto out;
115 dprintk("found fsidtype %d\n", fsidtyp 107 dprintk("found fsidtype %d\n", fsidtype);
116 if (key_len(fsidtype)==0) /* invalid t 108 if (key_len(fsidtype)==0) /* invalid type */
117 goto out; 109 goto out;
118 if ((len=qword_get(&mesg, buf, PAGE_SI 110 if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
119 goto out; 111 goto out;
120 dprintk("found fsid length %d\n", len) 112 dprintk("found fsid length %d\n", len);
121 if (len != key_len(fsidtype)) 113 if (len != key_len(fsidtype))
122 goto out; 114 goto out;
123 115
124 /* OK, we seem to have a valid key */ 116 /* OK, we seem to have a valid key */
125 key.h.flags = 0; 117 key.h.flags = 0;
126 err = get_expiry(&mesg, &key.h.expiry_ !! 118 key.h.expiry_time = get_expiry(&mesg);
127 if (err) !! 119 if (key.h.expiry_time == 0)
128 goto out; 120 goto out;
129 121
130 key.ek_client = dom; !! 122 key.ek_client = dom;
131 key.ek_fsidtype = fsidtype; 123 key.ek_fsidtype = fsidtype;
132 memcpy(key.ek_fsid, buf, len); 124 memcpy(key.ek_fsid, buf, len);
133 125
134 ek = svc_expkey_lookup(cd, &key); 126 ek = svc_expkey_lookup(cd, &key);
135 err = -ENOMEM; 127 err = -ENOMEM;
136 if (!ek) 128 if (!ek)
137 goto out; 129 goto out;
138 130
139 /* now we want a pathname, or empty me 131 /* now we want a pathname, or empty meaning NEGATIVE */
140 err = -EINVAL; 132 err = -EINVAL;
141 len = qword_get(&mesg, buf, PAGE_SIZE) 133 len = qword_get(&mesg, buf, PAGE_SIZE);
142 if (len < 0) 134 if (len < 0)
143 goto out; 135 goto out;
144 dprintk("Path seems to be <%s>\n", buf 136 dprintk("Path seems to be <%s>\n", buf);
145 err = 0; 137 err = 0;
146 if (len == 0) { 138 if (len == 0) {
147 set_bit(CACHE_NEGATIVE, &key.h 139 set_bit(CACHE_NEGATIVE, &key.h.flags);
148 ek = svc_expkey_update(cd, &ke 140 ek = svc_expkey_update(cd, &key, ek);
149 if (ek) !! 141 if (!ek)
150 trace_nfsd_expkey_upda <<
151 else <<
152 err = -ENOMEM; 142 err = -ENOMEM;
153 } else { 143 } else {
154 err = kern_path(buf, 0, &key.e 144 err = kern_path(buf, 0, &key.ek_path);
155 if (err) 145 if (err)
156 goto out; 146 goto out;
157 147
158 dprintk("Found the path %s\n", 148 dprintk("Found the path %s\n", buf);
159 149
160 ek = svc_expkey_update(cd, &ke 150 ek = svc_expkey_update(cd, &key, ek);
161 if (ek) !! 151 if (!ek)
162 trace_nfsd_expkey_upda <<
163 else <<
164 err = -ENOMEM; 152 err = -ENOMEM;
165 path_put(&key.ek_path); 153 path_put(&key.ek_path);
166 } 154 }
167 cache_flush(); 155 cache_flush();
168 out: 156 out:
169 if (ek) 157 if (ek)
170 cache_put(&ek->h, cd); 158 cache_put(&ek->h, cd);
171 if (dom) 159 if (dom)
172 auth_domain_put(dom); 160 auth_domain_put(dom);
173 kfree(buf); 161 kfree(buf);
174 return err; 162 return err;
175 } 163 }
176 164
177 static int expkey_show(struct seq_file *m, 165 static int expkey_show(struct seq_file *m,
178 struct cache_detail *cd 166 struct cache_detail *cd,
179 struct cache_head *h) 167 struct cache_head *h)
180 { 168 {
181 struct svc_expkey *ek ; 169 struct svc_expkey *ek ;
182 int i; 170 int i;
183 171
184 if (h ==NULL) { 172 if (h ==NULL) {
185 seq_puts(m, "#domain fsidtype 173 seq_puts(m, "#domain fsidtype fsid [path]\n");
186 return 0; 174 return 0;
187 } 175 }
188 ek = container_of(h, struct svc_expkey 176 ek = container_of(h, struct svc_expkey, h);
189 seq_printf(m, "%s %d 0x", ek->ek_clien 177 seq_printf(m, "%s %d 0x", ek->ek_client->name,
190 ek->ek_fsidtype); 178 ek->ek_fsidtype);
191 for (i=0; i < key_len(ek->ek_fsidtype) 179 for (i=0; i < key_len(ek->ek_fsidtype)/4; i++)
192 seq_printf(m, "%08x", ek->ek_f 180 seq_printf(m, "%08x", ek->ek_fsid[i]);
193 if (test_bit(CACHE_VALID, &h->flags) & 181 if (test_bit(CACHE_VALID, &h->flags) &&
194 !test_bit(CACHE_NEGATIVE, &h->flag 182 !test_bit(CACHE_NEGATIVE, &h->flags)) {
195 seq_printf(m, " "); 183 seq_printf(m, " ");
196 seq_path(m, &ek->ek_path, "\\ 184 seq_path(m, &ek->ek_path, "\\ \t\n");
197 } 185 }
198 seq_printf(m, "\n"); 186 seq_printf(m, "\n");
199 return 0; 187 return 0;
200 } 188 }
201 189
202 static inline int expkey_match (struct cache_h 190 static inline int expkey_match (struct cache_head *a, struct cache_head *b)
203 { 191 {
204 struct svc_expkey *orig = container_of 192 struct svc_expkey *orig = container_of(a, struct svc_expkey, h);
205 struct svc_expkey *new = container_of( 193 struct svc_expkey *new = container_of(b, struct svc_expkey, h);
206 194
207 if (orig->ek_fsidtype != new->ek_fsidt 195 if (orig->ek_fsidtype != new->ek_fsidtype ||
208 orig->ek_client != new->ek_client 196 orig->ek_client != new->ek_client ||
209 memcmp(orig->ek_fsid, new->ek_fsid 197 memcmp(orig->ek_fsid, new->ek_fsid, key_len(orig->ek_fsidtype)) != 0)
210 return 0; 198 return 0;
211 return 1; 199 return 1;
212 } 200 }
213 201
214 static inline void expkey_init(struct cache_he 202 static inline void expkey_init(struct cache_head *cnew,
215 struct cach 203 struct cache_head *citem)
216 { 204 {
217 struct svc_expkey *new = container_of( 205 struct svc_expkey *new = container_of(cnew, struct svc_expkey, h);
218 struct svc_expkey *item = container_of 206 struct svc_expkey *item = container_of(citem, struct svc_expkey, h);
219 207
220 kref_get(&item->ek_client->ref); 208 kref_get(&item->ek_client->ref);
221 new->ek_client = item->ek_client; 209 new->ek_client = item->ek_client;
222 new->ek_fsidtype = item->ek_fsidtype; 210 new->ek_fsidtype = item->ek_fsidtype;
223 211
224 memcpy(new->ek_fsid, item->ek_fsid, si 212 memcpy(new->ek_fsid, item->ek_fsid, sizeof(new->ek_fsid));
225 } 213 }
226 214
227 static inline void expkey_update(struct cache_ 215 static inline void expkey_update(struct cache_head *cnew,
228 struct cach 216 struct cache_head *citem)
229 { 217 {
230 struct svc_expkey *new = container_of( 218 struct svc_expkey *new = container_of(cnew, struct svc_expkey, h);
231 struct svc_expkey *item = container_of 219 struct svc_expkey *item = container_of(citem, struct svc_expkey, h);
232 220
233 new->ek_path = item->ek_path; 221 new->ek_path = item->ek_path;
234 path_get(&item->ek_path); 222 path_get(&item->ek_path);
235 } 223 }
236 224
237 static struct cache_head *expkey_alloc(void) 225 static struct cache_head *expkey_alloc(void)
238 { 226 {
239 struct svc_expkey *i = kmalloc(sizeof( 227 struct svc_expkey *i = kmalloc(sizeof(*i), GFP_KERNEL);
240 if (i) 228 if (i)
241 return &i->h; 229 return &i->h;
242 else 230 else
243 return NULL; 231 return NULL;
244 } 232 }
245 233
246 static void expkey_flush(void) !! 234 static struct cache_detail svc_expkey_cache_template = {
247 { <<
248 /* <<
249 * Take the nfsd_mutex here to ensure <<
250 * destroyed while we're in the middle <<
251 */ <<
252 mutex_lock(&nfsd_mutex); <<
253 nfsd_file_cache_purge(current->nsproxy <<
254 mutex_unlock(&nfsd_mutex); <<
255 } <<
256 <<
257 static const struct cache_detail svc_expkey_ca <<
258 .owner = THIS_MODULE, 235 .owner = THIS_MODULE,
259 .hash_size = EXPKEY_HASHMAX, 236 .hash_size = EXPKEY_HASHMAX,
260 .name = "nfsd.fh", 237 .name = "nfsd.fh",
261 .cache_put = expkey_put, 238 .cache_put = expkey_put,
262 .cache_upcall = expkey_upcall, <<
263 .cache_request = expkey_request, 239 .cache_request = expkey_request,
264 .cache_parse = expkey_parse, 240 .cache_parse = expkey_parse,
265 .cache_show = expkey_show, 241 .cache_show = expkey_show,
266 .match = expkey_match, 242 .match = expkey_match,
267 .init = expkey_init, 243 .init = expkey_init,
268 .update = expkey_update, 244 .update = expkey_update,
269 .alloc = expkey_alloc, 245 .alloc = expkey_alloc,
270 .flush = expkey_flush, <<
271 }; 246 };
272 247
273 static int 248 static int
274 svc_expkey_hash(struct svc_expkey *item) 249 svc_expkey_hash(struct svc_expkey *item)
275 { 250 {
276 int hash = item->ek_fsidtype; 251 int hash = item->ek_fsidtype;
277 char * cp = (char*)item->ek_fsid; 252 char * cp = (char*)item->ek_fsid;
278 int len = key_len(item->ek_fsidtype); 253 int len = key_len(item->ek_fsidtype);
279 254
280 hash ^= hash_mem(cp, len, EXPKEY_HASHB 255 hash ^= hash_mem(cp, len, EXPKEY_HASHBITS);
281 hash ^= hash_ptr(item->ek_client, EXPK 256 hash ^= hash_ptr(item->ek_client, EXPKEY_HASHBITS);
282 hash &= EXPKEY_HASHMASK; 257 hash &= EXPKEY_HASHMASK;
283 return hash; 258 return hash;
284 } 259 }
285 260
286 static struct svc_expkey * 261 static struct svc_expkey *
287 svc_expkey_lookup(struct cache_detail *cd, str 262 svc_expkey_lookup(struct cache_detail *cd, struct svc_expkey *item)
288 { 263 {
289 struct cache_head *ch; 264 struct cache_head *ch;
290 int hash = svc_expkey_hash(item); 265 int hash = svc_expkey_hash(item);
291 266
292 ch = sunrpc_cache_lookup_rcu(cd, &item !! 267 ch = sunrpc_cache_lookup(cd, &item->h, hash);
293 if (ch) 268 if (ch)
294 return container_of(ch, struct 269 return container_of(ch, struct svc_expkey, h);
295 else 270 else
296 return NULL; 271 return NULL;
297 } 272 }
298 273
299 static struct svc_expkey * 274 static struct svc_expkey *
300 svc_expkey_update(struct cache_detail *cd, str 275 svc_expkey_update(struct cache_detail *cd, struct svc_expkey *new,
301 struct svc_expkey *old) 276 struct svc_expkey *old)
302 { 277 {
303 struct cache_head *ch; 278 struct cache_head *ch;
304 int hash = svc_expkey_hash(new); 279 int hash = svc_expkey_hash(new);
305 280
306 ch = sunrpc_cache_update(cd, &new->h, 281 ch = sunrpc_cache_update(cd, &new->h, &old->h, hash);
307 if (ch) 282 if (ch)
308 return container_of(ch, struct 283 return container_of(ch, struct svc_expkey, h);
309 else 284 else
310 return NULL; 285 return NULL;
311 } 286 }
312 287
313 288
314 #define EXPORT_HASHBITS 8 289 #define EXPORT_HASHBITS 8
315 #define EXPORT_HASHMAX (1<< EXPORT_HA 290 #define EXPORT_HASHMAX (1<< EXPORT_HASHBITS)
316 291
317 static void nfsd4_fslocs_free(struct nfsd4_fs_ 292 static void nfsd4_fslocs_free(struct nfsd4_fs_locations *fsloc)
318 { 293 {
319 struct nfsd4_fs_location *locations = 294 struct nfsd4_fs_location *locations = fsloc->locations;
320 int i; 295 int i;
321 296
322 if (!locations) 297 if (!locations)
323 return; 298 return;
324 299
325 for (i = 0; i < fsloc->locations_count 300 for (i = 0; i < fsloc->locations_count; i++) {
326 kfree(locations[i].path); 301 kfree(locations[i].path);
327 kfree(locations[i].hosts); 302 kfree(locations[i].hosts);
328 } 303 }
329 304
330 kfree(locations); 305 kfree(locations);
331 fsloc->locations = NULL; 306 fsloc->locations = NULL;
332 } 307 }
333 308
334 static int export_stats_init(struct export_sta <<
335 { <<
336 stats->start_time = ktime_get_seconds( <<
337 return percpu_counter_init_many(stats- <<
338 EXP_ST <<
339 } <<
340 <<
341 static void export_stats_reset(struct export_s <<
342 { <<
343 if (stats) { <<
344 int i; <<
345 <<
346 for (i = 0; i < EXP_STATS_COUN <<
347 percpu_counter_set(&st <<
348 } <<
349 } <<
350 <<
351 static void export_stats_destroy(struct export <<
352 { <<
353 if (stats) <<
354 percpu_counter_destroy_many(st <<
355 EX <<
356 } <<
357 <<
358 static void svc_export_put(struct kref *ref) 309 static void svc_export_put(struct kref *ref)
359 { 310 {
360 struct svc_export *exp = container_of( 311 struct svc_export *exp = container_of(ref, struct svc_export, h.ref);
361 path_put(&exp->ex_path); 312 path_put(&exp->ex_path);
362 auth_domain_put(exp->ex_client); 313 auth_domain_put(exp->ex_client);
363 nfsd4_fslocs_free(&exp->ex_fslocs); 314 nfsd4_fslocs_free(&exp->ex_fslocs);
364 export_stats_destroy(exp->ex_stats); <<
365 kfree(exp->ex_stats); <<
366 kfree(exp->ex_uuid); 315 kfree(exp->ex_uuid);
367 kfree_rcu(exp, ex_rcu); !! 316 kfree(exp);
368 } <<
369 <<
370 static int svc_export_upcall(struct cache_deta <<
371 { <<
372 return sunrpc_cache_pipe_upcall(cd, h) <<
373 } 317 }
374 318
375 static void svc_export_request(struct cache_de 319 static void svc_export_request(struct cache_detail *cd,
376 struct cache_he 320 struct cache_head *h,
377 char **bpp, int 321 char **bpp, int *blen)
378 { 322 {
379 /* client path */ 323 /* client path */
380 struct svc_export *exp = container_of( 324 struct svc_export *exp = container_of(h, struct svc_export, h);
381 char *pth; 325 char *pth;
382 326
383 qword_add(bpp, blen, exp->ex_client->n 327 qword_add(bpp, blen, exp->ex_client->name);
384 pth = d_path(&exp->ex_path, *bpp, *ble 328 pth = d_path(&exp->ex_path, *bpp, *blen);
385 if (IS_ERR(pth)) { 329 if (IS_ERR(pth)) {
386 /* is this correct? */ 330 /* is this correct? */
387 (*bpp)[0] = '\n'; 331 (*bpp)[0] = '\n';
388 return; 332 return;
389 } 333 }
390 qword_add(bpp, blen, pth); 334 qword_add(bpp, blen, pth);
391 (*bpp)[-1] = '\n'; 335 (*bpp)[-1] = '\n';
392 } 336 }
393 337
394 static struct svc_export *svc_export_update(st 338 static struct svc_export *svc_export_update(struct svc_export *new,
395 st 339 struct svc_export *old);
396 static struct svc_export *svc_export_lookup(st 340 static struct svc_export *svc_export_lookup(struct svc_export *);
397 341
398 static int check_export(struct path *path, int !! 342 static int check_export(struct inode *inode, int *flags, unsigned char *uuid)
399 { 343 {
400 struct inode *inode = d_inode(path->de <<
401 344
402 /* 345 /*
403 * We currently export only dirs, regu 346 * We currently export only dirs, regular files, and (for v4
404 * pseudoroot) symlinks. 347 * pseudoroot) symlinks.
405 */ 348 */
406 if (!S_ISDIR(inode->i_mode) && 349 if (!S_ISDIR(inode->i_mode) &&
407 !S_ISLNK(inode->i_mode) && 350 !S_ISLNK(inode->i_mode) &&
408 !S_ISREG(inode->i_mode)) 351 !S_ISREG(inode->i_mode))
409 return -ENOTDIR; 352 return -ENOTDIR;
410 353
411 /* 354 /*
412 * Mountd should never pass down a wri 355 * Mountd should never pass down a writeable V4ROOT export, but,
413 * just to make sure: 356 * just to make sure:
414 */ 357 */
415 if (*flags & NFSEXP_V4ROOT) 358 if (*flags & NFSEXP_V4ROOT)
416 *flags |= NFSEXP_READONLY; 359 *flags |= NFSEXP_READONLY;
417 360
418 /* There are two requirements on a fil 361 /* There are two requirements on a filesystem to be exportable.
419 * 1: We must be able to identify the 362 * 1: We must be able to identify the filesystem from a number.
420 * either a device number (so FS 363 * either a device number (so FS_REQUIRES_DEV needed)
421 * or an FSID number (so NFSEXP_ 364 * or an FSID number (so NFSEXP_FSID or ->uuid is needed).
422 * 2: We must be able to find an inod 365 * 2: We must be able to find an inode from a filehandle.
423 * This means that s_export_op m 366 * This means that s_export_op must be set.
424 * 3: We must not currently be on an i <<
425 */ 367 */
426 if (!(inode->i_sb->s_type->fs_flags & 368 if (!(inode->i_sb->s_type->fs_flags & FS_REQUIRES_DEV) &&
427 !(*flags & NFSEXP_FSID) && 369 !(*flags & NFSEXP_FSID) &&
428 uuid == NULL) { 370 uuid == NULL) {
429 dprintk("exp_export: export of 371 dprintk("exp_export: export of non-dev fs without fsid\n");
430 return -EINVAL; 372 return -EINVAL;
431 } 373 }
432 374
433 if (!exportfs_can_decode_fh(inode->i_s !! 375 if (!inode->i_sb->s_export_op ||
>> 376 !inode->i_sb->s_export_op->fh_to_dentry) {
434 dprintk("exp_export: export of 377 dprintk("exp_export: export of invalid fs type.\n");
435 return -EINVAL; 378 return -EINVAL;
436 } 379 }
437 380
438 if (is_idmapped_mnt(path->mnt)) { <<
439 dprintk("exp_export: export of <<
440 return -EINVAL; <<
441 } <<
442 <<
443 if (inode->i_sb->s_export_op->flags & <<
444 !(*flags & NFSEXP_NOSUBTREECHECK)) <<
445 dprintk("%s: %s does not suppo <<
446 __func__, inode->i_sb- <<
447 return -EINVAL; <<
448 } <<
449 return 0; 381 return 0;
>> 382
450 } 383 }
451 384
452 #ifdef CONFIG_NFSD_V4 385 #ifdef CONFIG_NFSD_V4
453 386
454 static int 387 static int
455 fsloc_parse(char **mesg, char *buf, struct nfs 388 fsloc_parse(char **mesg, char *buf, struct nfsd4_fs_locations *fsloc)
456 { 389 {
457 int len; 390 int len;
458 int migrated, i, err; 391 int migrated, i, err;
459 392
460 /* more than one fsloc */ 393 /* more than one fsloc */
461 if (fsloc->locations) 394 if (fsloc->locations)
462 return -EINVAL; 395 return -EINVAL;
463 396
464 /* listsize */ 397 /* listsize */
465 err = get_uint(mesg, &fsloc->locations 398 err = get_uint(mesg, &fsloc->locations_count);
466 if (err) 399 if (err)
467 return err; 400 return err;
468 if (fsloc->locations_count > MAX_FS_LO 401 if (fsloc->locations_count > MAX_FS_LOCATIONS)
469 return -EINVAL; 402 return -EINVAL;
470 if (fsloc->locations_count == 0) 403 if (fsloc->locations_count == 0)
471 return 0; 404 return 0;
472 405
473 fsloc->locations = kcalloc(fsloc->loca !! 406 fsloc->locations = kzalloc(fsloc->locations_count
474 sizeof(stru !! 407 * sizeof(struct nfsd4_fs_location), GFP_KERNEL);
475 GFP_KERNEL) <<
476 if (!fsloc->locations) 408 if (!fsloc->locations)
477 return -ENOMEM; 409 return -ENOMEM;
478 for (i=0; i < fsloc->locations_count; 410 for (i=0; i < fsloc->locations_count; i++) {
479 /* colon separated host list * 411 /* colon separated host list */
480 err = -EINVAL; 412 err = -EINVAL;
481 len = qword_get(mesg, buf, PAG 413 len = qword_get(mesg, buf, PAGE_SIZE);
482 if (len <= 0) 414 if (len <= 0)
483 goto out_free_all; 415 goto out_free_all;
484 err = -ENOMEM; 416 err = -ENOMEM;
485 fsloc->locations[i].hosts = ks 417 fsloc->locations[i].hosts = kstrdup(buf, GFP_KERNEL);
486 if (!fsloc->locations[i].hosts 418 if (!fsloc->locations[i].hosts)
487 goto out_free_all; 419 goto out_free_all;
488 err = -EINVAL; 420 err = -EINVAL;
489 /* slash separated path compon 421 /* slash separated path component list */
490 len = qword_get(mesg, buf, PAG 422 len = qword_get(mesg, buf, PAGE_SIZE);
491 if (len <= 0) 423 if (len <= 0)
492 goto out_free_all; 424 goto out_free_all;
493 err = -ENOMEM; 425 err = -ENOMEM;
494 fsloc->locations[i].path = kst 426 fsloc->locations[i].path = kstrdup(buf, GFP_KERNEL);
495 if (!fsloc->locations[i].path) 427 if (!fsloc->locations[i].path)
496 goto out_free_all; 428 goto out_free_all;
497 } 429 }
498 /* migrated */ 430 /* migrated */
499 err = get_int(mesg, &migrated); 431 err = get_int(mesg, &migrated);
500 if (err) 432 if (err)
501 goto out_free_all; 433 goto out_free_all;
502 err = -EINVAL; 434 err = -EINVAL;
503 if (migrated < 0 || migrated > 1) 435 if (migrated < 0 || migrated > 1)
504 goto out_free_all; 436 goto out_free_all;
505 fsloc->migrated = migrated; 437 fsloc->migrated = migrated;
506 return 0; 438 return 0;
507 out_free_all: 439 out_free_all:
508 nfsd4_fslocs_free(fsloc); 440 nfsd4_fslocs_free(fsloc);
509 return err; 441 return err;
510 } 442 }
511 443
512 static int secinfo_parse(char **mesg, char *bu 444 static int secinfo_parse(char **mesg, char *buf, struct svc_export *exp)
513 { 445 {
514 struct exp_flavor_info *f; 446 struct exp_flavor_info *f;
515 u32 listsize; 447 u32 listsize;
516 int err; 448 int err;
517 449
518 /* more than one secinfo */ 450 /* more than one secinfo */
519 if (exp->ex_nflavors) 451 if (exp->ex_nflavors)
520 return -EINVAL; 452 return -EINVAL;
521 453
522 err = get_uint(mesg, &listsize); 454 err = get_uint(mesg, &listsize);
523 if (err) 455 if (err)
524 return err; 456 return err;
525 if (listsize > MAX_SECINFO_LIST) 457 if (listsize > MAX_SECINFO_LIST)
526 return -EINVAL; 458 return -EINVAL;
527 459
528 for (f = exp->ex_flavors; f < exp->ex_ 460 for (f = exp->ex_flavors; f < exp->ex_flavors + listsize; f++) {
529 err = get_uint(mesg, &f->pseud 461 err = get_uint(mesg, &f->pseudoflavor);
530 if (err) 462 if (err)
531 return err; 463 return err;
532 /* 464 /*
533 * XXX: It would be nice to al 465 * XXX: It would be nice to also check whether this
534 * pseudoflavor is supported, 466 * pseudoflavor is supported, so we can discover the
535 * problem at export time inst 467 * problem at export time instead of when a client fails
536 * to authenticate. 468 * to authenticate.
537 */ 469 */
538 err = get_uint(mesg, &f->flags 470 err = get_uint(mesg, &f->flags);
539 if (err) 471 if (err)
540 return err; 472 return err;
541 /* Only some flags are allowed 473 /* Only some flags are allowed to differ between flavors: */
542 if (~NFSEXP_SECINFO_FLAGS & (f 474 if (~NFSEXP_SECINFO_FLAGS & (f->flags ^ exp->ex_flags))
543 return -EINVAL; 475 return -EINVAL;
544 } 476 }
545 exp->ex_nflavors = listsize; 477 exp->ex_nflavors = listsize;
546 return 0; 478 return 0;
547 } 479 }
548 480
549 #else /* CONFIG_NFSD_V4 */ 481 #else /* CONFIG_NFSD_V4 */
550 static inline int 482 static inline int
551 fsloc_parse(char **mesg, char *buf, struct nfs 483 fsloc_parse(char **mesg, char *buf, struct nfsd4_fs_locations *fsloc){return 0;}
552 static inline int 484 static inline int
553 secinfo_parse(char **mesg, char *buf, struct s 485 secinfo_parse(char **mesg, char *buf, struct svc_export *exp) { return 0; }
554 #endif 486 #endif
555 487
556 static int xprtsec_parse(char **mesg, char *bu <<
557 { <<
558 unsigned int i, mode, listsize; <<
559 int err; <<
560 <<
561 err = get_uint(mesg, &listsize); <<
562 if (err) <<
563 return err; <<
564 if (listsize > NFSEXP_XPRTSEC_NUM) <<
565 return -EINVAL; <<
566 <<
567 exp->ex_xprtsec_modes = 0; <<
568 for (i = 0; i < listsize; i++) { <<
569 err = get_uint(mesg, &mode); <<
570 if (err) <<
571 return err; <<
572 if (mode > NFSEXP_XPRTSEC_MTLS <<
573 return -EINVAL; <<
574 exp->ex_xprtsec_modes |= mode; <<
575 } <<
576 return 0; <<
577 } <<
578 <<
579 static inline int 488 static inline int
580 nfsd_uuid_parse(char **mesg, char *buf, unsign !! 489 uuid_parse(char **mesg, char *buf, unsigned char **puuid)
581 { 490 {
582 int len; 491 int len;
583 492
584 /* more than one uuid */ 493 /* more than one uuid */
585 if (*puuid) 494 if (*puuid)
586 return -EINVAL; 495 return -EINVAL;
587 496
588 /* expect a 16 byte uuid encoded as \x 497 /* expect a 16 byte uuid encoded as \xXXXX... */
589 len = qword_get(mesg, buf, PAGE_SIZE); 498 len = qword_get(mesg, buf, PAGE_SIZE);
590 if (len != EX_UUID_LEN) 499 if (len != EX_UUID_LEN)
591 return -EINVAL; 500 return -EINVAL;
592 501
593 *puuid = kmemdup(buf, EX_UUID_LEN, GFP 502 *puuid = kmemdup(buf, EX_UUID_LEN, GFP_KERNEL);
594 if (*puuid == NULL) 503 if (*puuid == NULL)
595 return -ENOMEM; 504 return -ENOMEM;
596 505
597 return 0; 506 return 0;
598 } 507 }
599 508
600 static int svc_export_parse(struct cache_detai 509 static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
601 { 510 {
602 /* client path expiry [flags anonuid a 511 /* client path expiry [flags anonuid anongid fsid] */
603 char *buf; 512 char *buf;
>> 513 int len;
604 int err; 514 int err;
605 struct auth_domain *dom = NULL; 515 struct auth_domain *dom = NULL;
606 struct svc_export exp = {}, *expp; 516 struct svc_export exp = {}, *expp;
607 int an_int; 517 int an_int;
608 518
609 if (mesg[mlen-1] != '\n') 519 if (mesg[mlen-1] != '\n')
610 return -EINVAL; 520 return -EINVAL;
611 mesg[mlen-1] = 0; 521 mesg[mlen-1] = 0;
612 522
613 buf = kmalloc(PAGE_SIZE, GFP_KERNEL); 523 buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
614 if (!buf) 524 if (!buf)
615 return -ENOMEM; 525 return -ENOMEM;
616 526
617 /* client */ 527 /* client */
618 err = -EINVAL; 528 err = -EINVAL;
619 if (qword_get(&mesg, buf, PAGE_SIZE) < !! 529 len = qword_get(&mesg, buf, PAGE_SIZE);
>> 530 if (len <= 0)
620 goto out; 531 goto out;
621 532
622 err = -ENOENT; 533 err = -ENOENT;
623 dom = auth_domain_find(buf); 534 dom = auth_domain_find(buf);
624 if (!dom) 535 if (!dom)
625 goto out; 536 goto out;
626 537
627 /* path */ 538 /* path */
628 err = -EINVAL; 539 err = -EINVAL;
629 if (qword_get(&mesg, buf, PAGE_SIZE) < !! 540 if ((len = qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
630 goto out1; 541 goto out1;
631 542
632 err = kern_path(buf, 0, &exp.ex_path); 543 err = kern_path(buf, 0, &exp.ex_path);
633 if (err) 544 if (err)
634 goto out1; 545 goto out1;
635 546
636 exp.ex_client = dom; 547 exp.ex_client = dom;
637 exp.cd = cd; 548 exp.cd = cd;
638 exp.ex_devid_map = NULL; 549 exp.ex_devid_map = NULL;
639 exp.ex_xprtsec_modes = NFSEXP_XPRTSEC_ <<
640 550
641 /* expiry */ 551 /* expiry */
642 err = get_expiry(&mesg, &exp.h.expiry_ !! 552 err = -EINVAL;
643 if (err) !! 553 exp.h.expiry_time = get_expiry(&mesg);
>> 554 if (exp.h.expiry_time == 0)
644 goto out3; 555 goto out3;
645 556
646 /* flags */ 557 /* flags */
647 err = get_int(&mesg, &an_int); 558 err = get_int(&mesg, &an_int);
648 if (err == -ENOENT) { 559 if (err == -ENOENT) {
649 err = 0; 560 err = 0;
650 set_bit(CACHE_NEGATIVE, &exp.h 561 set_bit(CACHE_NEGATIVE, &exp.h.flags);
651 } else { 562 } else {
652 if (err || an_int < 0) 563 if (err || an_int < 0)
653 goto out3; 564 goto out3;
654 exp.ex_flags= an_int; 565 exp.ex_flags= an_int;
655 !! 566
656 /* anon uid */ 567 /* anon uid */
657 err = get_int(&mesg, &an_int); 568 err = get_int(&mesg, &an_int);
658 if (err) 569 if (err)
659 goto out3; 570 goto out3;
660 exp.ex_anon_uid= make_kuid(cur !! 571 exp.ex_anon_uid= make_kuid(&init_user_ns, an_int);
661 572
662 /* anon gid */ 573 /* anon gid */
663 err = get_int(&mesg, &an_int); 574 err = get_int(&mesg, &an_int);
664 if (err) 575 if (err)
665 goto out3; 576 goto out3;
666 exp.ex_anon_gid= make_kgid(cur !! 577 exp.ex_anon_gid= make_kgid(&init_user_ns, an_int);
667 578
668 /* fsid */ 579 /* fsid */
669 err = get_int(&mesg, &an_int); 580 err = get_int(&mesg, &an_int);
670 if (err) 581 if (err)
671 goto out3; 582 goto out3;
672 exp.ex_fsid = an_int; 583 exp.ex_fsid = an_int;
673 584
674 while (qword_get(&mesg, buf, P !! 585 while ((len = qword_get(&mesg, buf, PAGE_SIZE)) > 0) {
675 if (strcmp(buf, "fsloc 586 if (strcmp(buf, "fsloc") == 0)
676 err = fsloc_pa 587 err = fsloc_parse(&mesg, buf, &exp.ex_fslocs);
677 else if (strcmp(buf, " 588 else if (strcmp(buf, "uuid") == 0)
678 err = nfsd_uui !! 589 err = uuid_parse(&mesg, buf, &exp.ex_uuid);
679 else if (strcmp(buf, " 590 else if (strcmp(buf, "secinfo") == 0)
680 err = secinfo_ 591 err = secinfo_parse(&mesg, buf, &exp);
681 else if (strcmp(buf, " <<
682 err = xprtsec_ <<
683 else 592 else
684 /* quietly ign 593 /* quietly ignore unknown words and anything
685 * following. 594 * following. Newer user-space can try to set
686 * new values, 595 * new values, then see what the result was.
687 */ 596 */
688 break; 597 break;
689 if (err) 598 if (err)
690 goto out4; 599 goto out4;
691 } 600 }
692 601
693 err = check_export(&exp.ex_pat !! 602 err = check_export(d_inode(exp.ex_path.dentry), &exp.ex_flags,
>> 603 exp.ex_uuid);
694 if (err) 604 if (err)
695 goto out4; 605 goto out4;
696 <<
697 /* 606 /*
698 * No point caching this if it 607 * No point caching this if it would immediately expire.
699 * Also, this protects exportf 608 * Also, this protects exportfs's dummy export from the
700 * anon_uid/anon_gid checks: 609 * anon_uid/anon_gid checks:
701 */ 610 */
702 if (exp.h.expiry_time < second 611 if (exp.h.expiry_time < seconds_since_boot())
703 goto out4; 612 goto out4;
704 /* 613 /*
705 * For some reason exportfs ha 614 * For some reason exportfs has been passing down an
706 * invalid (-1) uid & gid on t 615 * invalid (-1) uid & gid on the "dummy" export which it
707 * uses to test export support 616 * uses to test export support. To make sure exportfs
708 * sees errors from check_expo 617 * sees errors from check_export we therefore need to
709 * delay these checks till aft 618 * delay these checks till after check_export:
710 */ 619 */
711 err = -EINVAL; 620 err = -EINVAL;
712 if (!uid_valid(exp.ex_anon_uid 621 if (!uid_valid(exp.ex_anon_uid))
713 goto out4; 622 goto out4;
714 if (!gid_valid(exp.ex_anon_gid 623 if (!gid_valid(exp.ex_anon_gid))
715 goto out4; 624 goto out4;
716 err = 0; 625 err = 0;
717 626
718 nfsd4_setup_layout_type(&exp); 627 nfsd4_setup_layout_type(&exp);
719 } 628 }
720 629
721 expp = svc_export_lookup(&exp); 630 expp = svc_export_lookup(&exp);
722 if (!expp) { !! 631 if (expp)
>> 632 expp = svc_export_update(&exp, expp);
>> 633 else
723 err = -ENOMEM; 634 err = -ENOMEM;
724 goto out4; !! 635 cache_flush();
725 } !! 636 if (expp == NULL)
726 expp = svc_export_update(&exp, expp); <<
727 if (expp) { <<
728 trace_nfsd_export_update(expp) <<
729 cache_flush(); <<
730 exp_put(expp); <<
731 } else <<
732 err = -ENOMEM; 637 err = -ENOMEM;
>> 638 else
>> 639 exp_put(expp);
733 out4: 640 out4:
734 nfsd4_fslocs_free(&exp.ex_fslocs); 641 nfsd4_fslocs_free(&exp.ex_fslocs);
735 kfree(exp.ex_uuid); 642 kfree(exp.ex_uuid);
736 out3: 643 out3:
737 path_put(&exp.ex_path); 644 path_put(&exp.ex_path);
738 out1: 645 out1:
739 auth_domain_put(dom); 646 auth_domain_put(dom);
740 out: 647 out:
741 kfree(buf); 648 kfree(buf);
742 return err; 649 return err;
743 } 650 }
744 651
745 static void exp_flags(struct seq_file *m, int 652 static void exp_flags(struct seq_file *m, int flag, int fsid,
746 kuid_t anonu, kgid_t anong, st 653 kuid_t anonu, kgid_t anong, struct nfsd4_fs_locations *fslocs);
747 static void show_secinfo(struct seq_file *m, s 654 static void show_secinfo(struct seq_file *m, struct svc_export *exp);
748 655
749 static int is_export_stats_file(struct seq_fil <<
750 { <<
751 /* <<
752 * The export_stats file uses the same <<
753 * We use the file's name to determine <<
754 * There is no rename in nsfdfs, so d_ <<
755 */ <<
756 return !strcmp(m->file->f_path.dentry- <<
757 } <<
758 <<
759 static int svc_export_show(struct seq_file *m, 656 static int svc_export_show(struct seq_file *m,
760 struct cache_detail 657 struct cache_detail *cd,
761 struct cache_head * 658 struct cache_head *h)
762 { 659 {
763 struct svc_export *exp; !! 660 struct svc_export *exp ;
764 bool export_stats = is_export_stats_fi <<
765 661
766 if (h == NULL) { !! 662 if (h ==NULL) {
767 if (export_stats) !! 663 seq_puts(m, "#path domain(flags)\n");
768 seq_puts(m, "#path dom <<
769 else <<
770 seq_puts(m, "#path dom <<
771 return 0; 664 return 0;
772 } 665 }
773 exp = container_of(h, struct svc_expor 666 exp = container_of(h, struct svc_export, h);
774 seq_path(m, &exp->ex_path, " \t\n\\"); 667 seq_path(m, &exp->ex_path, " \t\n\\");
775 seq_putc(m, '\t'); 668 seq_putc(m, '\t');
776 seq_escape(m, exp->ex_client->name, " 669 seq_escape(m, exp->ex_client->name, " \t\n\\");
777 if (export_stats) { <<
778 struct percpu_counter *counter <<
779 <<
780 seq_printf(m, "\t%lld\n", exp- <<
781 seq_printf(m, "\tfh_stale: %ll <<
782 percpu_counter_sum_ <<
783 seq_printf(m, "\tio_read: %lld <<
784 percpu_counter_sum_ <<
785 seq_printf(m, "\tio_write: %ll <<
786 percpu_counter_sum_ <<
787 seq_putc(m, '\n'); <<
788 return 0; <<
789 } <<
790 seq_putc(m, '('); 670 seq_putc(m, '(');
791 if (test_bit(CACHE_VALID, &h->flags) & !! 671 if (test_bit(CACHE_VALID, &h->flags) &&
792 !test_bit(CACHE_NEGATIVE, &h->flag 672 !test_bit(CACHE_NEGATIVE, &h->flags)) {
793 exp_flags(m, exp->ex_flags, ex 673 exp_flags(m, exp->ex_flags, exp->ex_fsid,
794 exp->ex_anon_uid, ex 674 exp->ex_anon_uid, exp->ex_anon_gid, &exp->ex_fslocs);
795 if (exp->ex_uuid) { 675 if (exp->ex_uuid) {
796 int i; 676 int i;
797 seq_puts(m, ",uuid="); 677 seq_puts(m, ",uuid=");
798 for (i = 0; i < EX_UUI 678 for (i = 0; i < EX_UUID_LEN; i++) {
799 if ((i&3) == 0 679 if ((i&3) == 0 && i)
800 seq_pu 680 seq_putc(m, ':');
801 seq_printf(m, 681 seq_printf(m, "%02x", exp->ex_uuid[i]);
802 } 682 }
803 } 683 }
804 show_secinfo(m, exp); 684 show_secinfo(m, exp);
805 } 685 }
806 seq_puts(m, ")\n"); 686 seq_puts(m, ")\n");
807 return 0; 687 return 0;
808 } 688 }
809 static int svc_export_match(struct cache_head 689 static int svc_export_match(struct cache_head *a, struct cache_head *b)
810 { 690 {
811 struct svc_export *orig = container_of 691 struct svc_export *orig = container_of(a, struct svc_export, h);
812 struct svc_export *new = container_of( 692 struct svc_export *new = container_of(b, struct svc_export, h);
813 return orig->ex_client == new->ex_clie 693 return orig->ex_client == new->ex_client &&
814 path_equal(&orig->ex_path, &ne 694 path_equal(&orig->ex_path, &new->ex_path);
815 } 695 }
816 696
817 static void svc_export_init(struct cache_head 697 static void svc_export_init(struct cache_head *cnew, struct cache_head *citem)
818 { 698 {
819 struct svc_export *new = container_of( 699 struct svc_export *new = container_of(cnew, struct svc_export, h);
820 struct svc_export *item = container_of 700 struct svc_export *item = container_of(citem, struct svc_export, h);
821 701
822 kref_get(&item->ex_client->ref); 702 kref_get(&item->ex_client->ref);
823 new->ex_client = item->ex_client; 703 new->ex_client = item->ex_client;
824 new->ex_path = item->ex_path; 704 new->ex_path = item->ex_path;
825 path_get(&item->ex_path); 705 path_get(&item->ex_path);
826 new->ex_fslocs.locations = NULL; 706 new->ex_fslocs.locations = NULL;
827 new->ex_fslocs.locations_count = 0; 707 new->ex_fslocs.locations_count = 0;
828 new->ex_fslocs.migrated = 0; 708 new->ex_fslocs.migrated = 0;
829 new->ex_layout_types = 0; 709 new->ex_layout_types = 0;
830 new->ex_uuid = NULL; 710 new->ex_uuid = NULL;
831 new->cd = item->cd; 711 new->cd = item->cd;
832 export_stats_reset(new->ex_stats); <<
833 } 712 }
834 713
835 static void export_update(struct cache_head *c 714 static void export_update(struct cache_head *cnew, struct cache_head *citem)
836 { 715 {
837 struct svc_export *new = container_of( 716 struct svc_export *new = container_of(cnew, struct svc_export, h);
838 struct svc_export *item = container_of 717 struct svc_export *item = container_of(citem, struct svc_export, h);
839 int i; 718 int i;
840 719
841 new->ex_flags = item->ex_flags; 720 new->ex_flags = item->ex_flags;
842 new->ex_anon_uid = item->ex_anon_uid; 721 new->ex_anon_uid = item->ex_anon_uid;
843 new->ex_anon_gid = item->ex_anon_gid; 722 new->ex_anon_gid = item->ex_anon_gid;
844 new->ex_fsid = item->ex_fsid; 723 new->ex_fsid = item->ex_fsid;
845 new->ex_devid_map = item->ex_devid_map 724 new->ex_devid_map = item->ex_devid_map;
846 item->ex_devid_map = NULL; 725 item->ex_devid_map = NULL;
847 new->ex_uuid = item->ex_uuid; 726 new->ex_uuid = item->ex_uuid;
848 item->ex_uuid = NULL; 727 item->ex_uuid = NULL;
849 new->ex_fslocs.locations = item->ex_fs 728 new->ex_fslocs.locations = item->ex_fslocs.locations;
850 item->ex_fslocs.locations = NULL; 729 item->ex_fslocs.locations = NULL;
851 new->ex_fslocs.locations_count = item- 730 new->ex_fslocs.locations_count = item->ex_fslocs.locations_count;
852 item->ex_fslocs.locations_count = 0; 731 item->ex_fslocs.locations_count = 0;
853 new->ex_fslocs.migrated = item->ex_fsl 732 new->ex_fslocs.migrated = item->ex_fslocs.migrated;
854 item->ex_fslocs.migrated = 0; 733 item->ex_fslocs.migrated = 0;
855 new->ex_layout_types = item->ex_layout 734 new->ex_layout_types = item->ex_layout_types;
856 new->ex_nflavors = item->ex_nflavors; 735 new->ex_nflavors = item->ex_nflavors;
857 for (i = 0; i < MAX_SECINFO_LIST; i++) 736 for (i = 0; i < MAX_SECINFO_LIST; i++) {
858 new->ex_flavors[i] = item->ex_ 737 new->ex_flavors[i] = item->ex_flavors[i];
859 } 738 }
860 new->ex_xprtsec_modes = item->ex_xprts <<
861 } 739 }
862 740
863 static struct cache_head *svc_export_alloc(voi 741 static struct cache_head *svc_export_alloc(void)
864 { 742 {
865 struct svc_export *i = kmalloc(sizeof( 743 struct svc_export *i = kmalloc(sizeof(*i), GFP_KERNEL);
866 if (!i) !! 744 if (i)
867 return NULL; !! 745 return &i->h;
868 !! 746 else
869 i->ex_stats = kmalloc(sizeof(*(i->ex_s <<
870 if (!i->ex_stats) { <<
871 kfree(i); <<
872 return NULL; <<
873 } <<
874 <<
875 if (export_stats_init(i->ex_stats)) { <<
876 kfree(i->ex_stats); <<
877 kfree(i); <<
878 return NULL; 747 return NULL;
879 } <<
880 <<
881 return &i->h; <<
882 } 748 }
883 749
884 static const struct cache_detail svc_export_ca !! 750 static struct cache_detail svc_export_cache_template = {
885 .owner = THIS_MODULE, 751 .owner = THIS_MODULE,
886 .hash_size = EXPORT_HASHMAX, 752 .hash_size = EXPORT_HASHMAX,
887 .name = "nfsd.export", 753 .name = "nfsd.export",
888 .cache_put = svc_export_put, 754 .cache_put = svc_export_put,
889 .cache_upcall = svc_export_upcall, <<
890 .cache_request = svc_export_request, 755 .cache_request = svc_export_request,
891 .cache_parse = svc_export_parse, 756 .cache_parse = svc_export_parse,
892 .cache_show = svc_export_show, 757 .cache_show = svc_export_show,
893 .match = svc_export_match, 758 .match = svc_export_match,
894 .init = svc_export_init, 759 .init = svc_export_init,
895 .update = export_update, 760 .update = export_update,
896 .alloc = svc_export_alloc, 761 .alloc = svc_export_alloc,
897 }; 762 };
898 763
899 static int 764 static int
900 svc_export_hash(struct svc_export *exp) 765 svc_export_hash(struct svc_export *exp)
901 { 766 {
902 int hash; 767 int hash;
903 768
904 hash = hash_ptr(exp->ex_client, EXPORT 769 hash = hash_ptr(exp->ex_client, EXPORT_HASHBITS);
905 hash ^= hash_ptr(exp->ex_path.dentry, 770 hash ^= hash_ptr(exp->ex_path.dentry, EXPORT_HASHBITS);
906 hash ^= hash_ptr(exp->ex_path.mnt, EXP 771 hash ^= hash_ptr(exp->ex_path.mnt, EXPORT_HASHBITS);
907 return hash; 772 return hash;
908 } 773 }
909 774
910 static struct svc_export * 775 static struct svc_export *
911 svc_export_lookup(struct svc_export *exp) 776 svc_export_lookup(struct svc_export *exp)
912 { 777 {
913 struct cache_head *ch; 778 struct cache_head *ch;
914 int hash = svc_export_hash(exp); 779 int hash = svc_export_hash(exp);
915 780
916 ch = sunrpc_cache_lookup_rcu(exp->cd, !! 781 ch = sunrpc_cache_lookup(exp->cd, &exp->h, hash);
917 if (ch) 782 if (ch)
918 return container_of(ch, struct 783 return container_of(ch, struct svc_export, h);
919 else 784 else
920 return NULL; 785 return NULL;
921 } 786 }
922 787
923 static struct svc_export * 788 static struct svc_export *
924 svc_export_update(struct svc_export *new, stru 789 svc_export_update(struct svc_export *new, struct svc_export *old)
925 { 790 {
926 struct cache_head *ch; 791 struct cache_head *ch;
927 int hash = svc_export_hash(old); 792 int hash = svc_export_hash(old);
928 793
929 ch = sunrpc_cache_update(old->cd, &new 794 ch = sunrpc_cache_update(old->cd, &new->h, &old->h, hash);
930 if (ch) 795 if (ch)
931 return container_of(ch, struct 796 return container_of(ch, struct svc_export, h);
932 else 797 else
933 return NULL; 798 return NULL;
934 } 799 }
935 800
936 801
937 static struct svc_expkey * 802 static struct svc_expkey *
938 exp_find_key(struct cache_detail *cd, struct a 803 exp_find_key(struct cache_detail *cd, struct auth_domain *clp, int fsid_type,
939 u32 *fsidv, struct cache_req *req 804 u32 *fsidv, struct cache_req *reqp)
940 { 805 {
941 struct svc_expkey key, *ek; 806 struct svc_expkey key, *ek;
942 int err; 807 int err;
943 808
944 if (!clp) 809 if (!clp)
945 return ERR_PTR(-ENOENT); 810 return ERR_PTR(-ENOENT);
946 811
947 key.ek_client = clp; 812 key.ek_client = clp;
948 key.ek_fsidtype = fsid_type; 813 key.ek_fsidtype = fsid_type;
949 memcpy(key.ek_fsid, fsidv, key_len(fsi 814 memcpy(key.ek_fsid, fsidv, key_len(fsid_type));
950 815
951 ek = svc_expkey_lookup(cd, &key); 816 ek = svc_expkey_lookup(cd, &key);
952 if (ek == NULL) 817 if (ek == NULL)
953 return ERR_PTR(-ENOMEM); 818 return ERR_PTR(-ENOMEM);
954 err = cache_check(cd, &ek->h, reqp); 819 err = cache_check(cd, &ek->h, reqp);
955 if (err) { !! 820 if (err)
956 trace_nfsd_exp_find_key(&key, <<
957 return ERR_PTR(err); 821 return ERR_PTR(err);
958 } <<
959 return ek; 822 return ek;
960 } 823 }
961 824
962 static struct svc_export * 825 static struct svc_export *
963 exp_get_by_name(struct cache_detail *cd, struc 826 exp_get_by_name(struct cache_detail *cd, struct auth_domain *clp,
964 const struct path *path, struc 827 const struct path *path, struct cache_req *reqp)
965 { 828 {
966 struct svc_export *exp, key; 829 struct svc_export *exp, key;
967 int err; 830 int err;
968 831
969 if (!clp) 832 if (!clp)
970 return ERR_PTR(-ENOENT); 833 return ERR_PTR(-ENOENT);
971 834
972 key.ex_client = clp; 835 key.ex_client = clp;
973 key.ex_path = *path; 836 key.ex_path = *path;
974 key.cd = cd; 837 key.cd = cd;
975 838
976 exp = svc_export_lookup(&key); 839 exp = svc_export_lookup(&key);
977 if (exp == NULL) 840 if (exp == NULL)
978 return ERR_PTR(-ENOMEM); 841 return ERR_PTR(-ENOMEM);
979 err = cache_check(cd, &exp->h, reqp); 842 err = cache_check(cd, &exp->h, reqp);
980 if (err) { !! 843 if (err)
981 trace_nfsd_exp_get_by_name(&ke <<
982 return ERR_PTR(err); 844 return ERR_PTR(err);
983 } <<
984 return exp; 845 return exp;
985 } 846 }
986 847
987 /* 848 /*
988 * Find the export entry for a given dentry. 849 * Find the export entry for a given dentry.
989 */ 850 */
990 static struct svc_export * 851 static struct svc_export *
991 exp_parent(struct cache_detail *cd, struct aut 852 exp_parent(struct cache_detail *cd, struct auth_domain *clp, struct path *path)
992 { 853 {
993 struct dentry *saved = dget(path->dent 854 struct dentry *saved = dget(path->dentry);
994 struct svc_export *exp = exp_get_by_na 855 struct svc_export *exp = exp_get_by_name(cd, clp, path, NULL);
995 856
996 while (PTR_ERR(exp) == -ENOENT && !IS_ 857 while (PTR_ERR(exp) == -ENOENT && !IS_ROOT(path->dentry)) {
997 struct dentry *parent = dget_p 858 struct dentry *parent = dget_parent(path->dentry);
998 dput(path->dentry); 859 dput(path->dentry);
999 path->dentry = parent; 860 path->dentry = parent;
1000 exp = exp_get_by_name(cd, clp 861 exp = exp_get_by_name(cd, clp, path, NULL);
1001 } 862 }
1002 dput(path->dentry); 863 dput(path->dentry);
1003 path->dentry = saved; 864 path->dentry = saved;
1004 return exp; 865 return exp;
1005 } 866 }
1006 867
1007 868
1008 869
1009 /* 870 /*
1010 * Obtain the root fh on behalf of a client. 871 * Obtain the root fh on behalf of a client.
1011 * This could be done in user space, but I fe 872 * This could be done in user space, but I feel that it adds some safety
1012 * since its harder to fool a kernel module t 873 * since its harder to fool a kernel module than a user space program.
1013 */ 874 */
1014 int 875 int
1015 exp_rootfh(struct net *net, struct auth_domai 876 exp_rootfh(struct net *net, struct auth_domain *clp, char *name,
1016 struct knfsd_fh *f, int maxsize) 877 struct knfsd_fh *f, int maxsize)
1017 { 878 {
1018 struct svc_export *exp; 879 struct svc_export *exp;
1019 struct path path; 880 struct path path;
1020 struct inode *inode; 881 struct inode *inode;
1021 struct svc_fh fh; 882 struct svc_fh fh;
1022 int err; 883 int err;
1023 struct nfsd_net *nn = net_gen 884 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
1024 struct cache_detail *cd = nn->svc 885 struct cache_detail *cd = nn->svc_export_cache;
1025 886
1026 err = -EPERM; 887 err = -EPERM;
1027 /* NB: we probably ought to check tha 888 /* NB: we probably ought to check that it's NUL-terminated */
1028 if (kern_path(name, 0, &path)) { 889 if (kern_path(name, 0, &path)) {
1029 printk("nfsd: exp_rootfh path 890 printk("nfsd: exp_rootfh path not found %s", name);
1030 return err; 891 return err;
1031 } 892 }
1032 inode = d_inode(path.dentry); 893 inode = d_inode(path.dentry);
1033 894
1034 dprintk("nfsd: exp_rootfh(%s [%p] %s: 895 dprintk("nfsd: exp_rootfh(%s [%p] %s:%s/%ld)\n",
1035 name, path.dentry, clp->name 896 name, path.dentry, clp->name,
1036 inode->i_sb->s_id, inode->i_ 897 inode->i_sb->s_id, inode->i_ino);
1037 exp = exp_parent(cd, clp, &path); 898 exp = exp_parent(cd, clp, &path);
1038 if (IS_ERR(exp)) { 899 if (IS_ERR(exp)) {
1039 err = PTR_ERR(exp); 900 err = PTR_ERR(exp);
1040 goto out; 901 goto out;
1041 } 902 }
1042 903
1043 /* 904 /*
1044 * fh must be initialized before call 905 * fh must be initialized before calling fh_compose
1045 */ 906 */
1046 fh_init(&fh, maxsize); 907 fh_init(&fh, maxsize);
1047 if (fh_compose(&fh, exp, path.dentry, 908 if (fh_compose(&fh, exp, path.dentry, NULL))
1048 err = -EINVAL; 909 err = -EINVAL;
1049 else 910 else
1050 err = 0; 911 err = 0;
1051 memcpy(f, &fh.fh_handle, sizeof(struc 912 memcpy(f, &fh.fh_handle, sizeof(struct knfsd_fh));
1052 fh_put(&fh); 913 fh_put(&fh);
1053 exp_put(exp); 914 exp_put(exp);
1054 out: 915 out:
1055 path_put(&path); 916 path_put(&path);
1056 return err; 917 return err;
1057 } 918 }
1058 919
1059 static struct svc_export *exp_find(struct cac 920 static struct svc_export *exp_find(struct cache_detail *cd,
1060 struct aut 921 struct auth_domain *clp, int fsid_type,
1061 u32 *fsidv 922 u32 *fsidv, struct cache_req *reqp)
1062 { 923 {
1063 struct svc_export *exp; 924 struct svc_export *exp;
1064 struct nfsd_net *nn = net_generic(cd- 925 struct nfsd_net *nn = net_generic(cd->net, nfsd_net_id);
1065 struct svc_expkey *ek = exp_find_key( 926 struct svc_expkey *ek = exp_find_key(nn->svc_expkey_cache, clp, fsid_type, fsidv, reqp);
1066 if (IS_ERR(ek)) 927 if (IS_ERR(ek))
1067 return ERR_CAST(ek); 928 return ERR_CAST(ek);
1068 929
1069 exp = exp_get_by_name(cd, clp, &ek->e 930 exp = exp_get_by_name(cd, clp, &ek->ek_path, reqp);
1070 cache_put(&ek->h, nn->svc_expkey_cach 931 cache_put(&ek->h, nn->svc_expkey_cache);
1071 932
1072 if (IS_ERR(exp)) 933 if (IS_ERR(exp))
1073 return ERR_CAST(exp); 934 return ERR_CAST(exp);
1074 return exp; 935 return exp;
1075 } 936 }
1076 937
1077 /** <<
1078 * check_nfsd_access - check if access to exp <<
1079 * @exp: svc_export that is being accessed. <<
1080 * @rqstp: svc_rqst attempting to access @exp <<
1081 * <<
1082 * Return values: <<
1083 * %nfs_ok if access is granted, or <<
1084 * %nfserr_wrongsec if access is denied <<
1085 */ <<
1086 __be32 check_nfsd_access(struct svc_export *e 938 __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp)
1087 { 939 {
1088 struct exp_flavor_info *f, *end = exp !! 940 struct exp_flavor_info *f;
1089 struct svc_xprt *xprt; !! 941 struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;
1090 <<
1091 /* <<
1092 * If rqstp is NULL, this is a LOCALI <<
1093 * ever use a filehandle/credential p <<
1094 * been affirmed (by ACCESS or OPEN N <<
1095 * wire. So there is no need for furt <<
1096 */ <<
1097 if (!rqstp) <<
1098 return nfs_ok; <<
1099 <<
1100 xprt = rqstp->rq_xprt; <<
1101 <<
1102 if (exp->ex_xprtsec_modes & NFSEXP_XP <<
1103 if (!test_bit(XPT_TLS_SESSION <<
1104 goto ok; <<
1105 } <<
1106 if (exp->ex_xprtsec_modes & NFSEXP_XP <<
1107 if (test_bit(XPT_TLS_SESSION, <<
1108 !test_bit(XPT_PEER_AUTH, <<
1109 goto ok; <<
1110 } <<
1111 if (exp->ex_xprtsec_modes & NFSEXP_XP <<
1112 if (test_bit(XPT_TLS_SESSION, <<
1113 test_bit(XPT_PEER_AUTH, & <<
1114 goto ok; <<
1115 } <<
1116 goto denied; <<
1117 942
1118 ok: <<
1119 /* legacy gss-only clients are always 943 /* legacy gss-only clients are always OK: */
1120 if (exp->ex_client == rqstp->rq_gsscl 944 if (exp->ex_client == rqstp->rq_gssclient)
1121 return nfs_ok; !! 945 return 0;
1122 /* ip-address based client; check sec 946 /* ip-address based client; check sec= export option: */
1123 for (f = exp->ex_flavors; f < end; f+ 947 for (f = exp->ex_flavors; f < end; f++) {
1124 if (f->pseudoflavor == rqstp- 948 if (f->pseudoflavor == rqstp->rq_cred.cr_flavor)
1125 return nfs_ok; !! 949 return 0;
1126 } 950 }
1127 /* defaults in absence of sec= option 951 /* defaults in absence of sec= options: */
1128 if (exp->ex_nflavors == 0) { 952 if (exp->ex_nflavors == 0) {
1129 if (rqstp->rq_cred.cr_flavor 953 if (rqstp->rq_cred.cr_flavor == RPC_AUTH_NULL ||
1130 rqstp->rq_cred.cr_flavor 954 rqstp->rq_cred.cr_flavor == RPC_AUTH_UNIX)
1131 return nfs_ok; !! 955 return 0;
1132 } 956 }
1133 957
1134 /* If the compound op contains a spo_ 958 /* If the compound op contains a spo_must_allowed op,
1135 * it will be sent with integrity/pro 959 * it will be sent with integrity/protection which
1136 * will have to be expressly allowed 960 * will have to be expressly allowed on mounts that
1137 * don't support it 961 * don't support it
1138 */ 962 */
1139 963
1140 if (nfsd4_spo_must_allow(rqstp)) 964 if (nfsd4_spo_must_allow(rqstp))
1141 return nfs_ok; !! 965 return 0;
1142 966
1143 denied: <<
1144 return nfserr_wrongsec; 967 return nfserr_wrongsec;
1145 } 968 }
1146 969
1147 /* 970 /*
1148 * Uses rq_client and rq_gssclient to find an 971 * Uses rq_client and rq_gssclient to find an export; uses rq_client (an
1149 * auth_unix client) if it's available and ha 972 * auth_unix client) if it's available and has secinfo information;
1150 * otherwise, will try to use rq_gssclient. 973 * otherwise, will try to use rq_gssclient.
1151 * 974 *
1152 * Called from functions that handle requests 975 * Called from functions that handle requests; functions that do work on
1153 * behalf of mountd are passed a single clien 976 * behalf of mountd are passed a single client name to use, and should
1154 * use exp_get_by_name() or exp_find(). 977 * use exp_get_by_name() or exp_find().
1155 */ 978 */
1156 struct svc_export * 979 struct svc_export *
1157 rqst_exp_get_by_name(struct svc_rqst *rqstp, 980 rqst_exp_get_by_name(struct svc_rqst *rqstp, struct path *path)
1158 { 981 {
1159 struct svc_export *gssexp, *exp = ERR 982 struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);
1160 struct nfsd_net *nn = net_generic(SVC 983 struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
1161 struct cache_detail *cd = nn->svc_exp 984 struct cache_detail *cd = nn->svc_export_cache;
1162 985
1163 if (rqstp->rq_client == NULL) 986 if (rqstp->rq_client == NULL)
1164 goto gss; 987 goto gss;
1165 988
1166 /* First try the auth_unix client: */ 989 /* First try the auth_unix client: */
1167 exp = exp_get_by_name(cd, rqstp->rq_c 990 exp = exp_get_by_name(cd, rqstp->rq_client, path, &rqstp->rq_chandle);
1168 if (PTR_ERR(exp) == -ENOENT) 991 if (PTR_ERR(exp) == -ENOENT)
1169 goto gss; 992 goto gss;
1170 if (IS_ERR(exp)) 993 if (IS_ERR(exp))
1171 return exp; 994 return exp;
1172 /* If it has secinfo, assume there ar 995 /* If it has secinfo, assume there are no gss/... clients */
1173 if (exp->ex_nflavors > 0) 996 if (exp->ex_nflavors > 0)
1174 return exp; 997 return exp;
1175 gss: 998 gss:
1176 /* Otherwise, try falling back on gss 999 /* Otherwise, try falling back on gss client */
1177 if (rqstp->rq_gssclient == NULL) 1000 if (rqstp->rq_gssclient == NULL)
1178 return exp; 1001 return exp;
1179 gssexp = exp_get_by_name(cd, rqstp->r 1002 gssexp = exp_get_by_name(cd, rqstp->rq_gssclient, path, &rqstp->rq_chandle);
1180 if (PTR_ERR(gssexp) == -ENOENT) 1003 if (PTR_ERR(gssexp) == -ENOENT)
1181 return exp; 1004 return exp;
1182 if (!IS_ERR(exp)) 1005 if (!IS_ERR(exp))
1183 exp_put(exp); 1006 exp_put(exp);
1184 return gssexp; 1007 return gssexp;
1185 } 1008 }
1186 1009
1187 /** <<
1188 * rqst_exp_find - Find an svc_export in the <<
1189 * @reqp: The handle to be used to susp <<
1190 * If NULL, missing in-cache inf <<
1191 * @net: The network namespace in whic <<
1192 * @cl: default auth_domain to use fo <<
1193 * @gsscl: an alternate auth_domain defi <<
1194 * @fsid_type: The type of fsid to look for <<
1195 * @fsidv: The actual fsid to look up in <<
1196 * <<
1197 * Perform a lookup for @cl/@fsidv in the giv <<
1198 * none found and @gsscl specified, repeat th <<
1199 * <<
1200 * Returns an export, or an error pointer. <<
1201 */ <<
1202 struct svc_export * 1010 struct svc_export *
1203 rqst_exp_find(struct cache_req *reqp, struct !! 1011 rqst_exp_find(struct svc_rqst *rqstp, int fsid_type, u32 *fsidv)
1204 struct auth_domain *cl, struct <<
1205 int fsid_type, u32 *fsidv) <<
1206 { 1012 {
1207 struct nfsd_net *nn = net_generic(net <<
1208 struct svc_export *gssexp, *exp = ERR 1013 struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);
>> 1014 struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
1209 struct cache_detail *cd = nn->svc_exp 1015 struct cache_detail *cd = nn->svc_export_cache;
1210 1016
1211 if (!cl) !! 1017 if (rqstp->rq_client == NULL)
1212 goto gss; 1018 goto gss;
1213 1019
1214 /* First try the auth_unix client: */ 1020 /* First try the auth_unix client: */
1215 exp = exp_find(cd, cl, fsid_type, fsi !! 1021 exp = exp_find(cd, rqstp->rq_client, fsid_type,
>> 1022 fsidv, &rqstp->rq_chandle);
1216 if (PTR_ERR(exp) == -ENOENT) 1023 if (PTR_ERR(exp) == -ENOENT)
1217 goto gss; 1024 goto gss;
1218 if (IS_ERR(exp)) 1025 if (IS_ERR(exp))
1219 return exp; 1026 return exp;
1220 /* If it has secinfo, assume there ar 1027 /* If it has secinfo, assume there are no gss/... clients */
1221 if (exp->ex_nflavors > 0) 1028 if (exp->ex_nflavors > 0)
1222 return exp; 1029 return exp;
1223 gss: 1030 gss:
1224 /* Otherwise, try falling back on gss 1031 /* Otherwise, try falling back on gss client */
1225 if (!gsscl) !! 1032 if (rqstp->rq_gssclient == NULL)
1226 return exp; 1033 return exp;
1227 gssexp = exp_find(cd, gsscl, fsid_typ !! 1034 gssexp = exp_find(cd, rqstp->rq_gssclient, fsid_type, fsidv,
>> 1035 &rqstp->rq_chandle);
1228 if (PTR_ERR(gssexp) == -ENOENT) 1036 if (PTR_ERR(gssexp) == -ENOENT)
1229 return exp; 1037 return exp;
1230 if (!IS_ERR(exp)) 1038 if (!IS_ERR(exp))
1231 exp_put(exp); 1039 exp_put(exp);
1232 return gssexp; 1040 return gssexp;
1233 } 1041 }
1234 1042
1235 struct svc_export * 1043 struct svc_export *
1236 rqst_exp_parent(struct svc_rqst *rqstp, struc 1044 rqst_exp_parent(struct svc_rqst *rqstp, struct path *path)
1237 { 1045 {
1238 struct dentry *saved = dget(path->den 1046 struct dentry *saved = dget(path->dentry);
1239 struct svc_export *exp = rqst_exp_get 1047 struct svc_export *exp = rqst_exp_get_by_name(rqstp, path);
1240 1048
1241 while (PTR_ERR(exp) == -ENOENT && !IS 1049 while (PTR_ERR(exp) == -ENOENT && !IS_ROOT(path->dentry)) {
1242 struct dentry *parent = dget_ 1050 struct dentry *parent = dget_parent(path->dentry);
1243 dput(path->dentry); 1051 dput(path->dentry);
1244 path->dentry = parent; 1052 path->dentry = parent;
1245 exp = rqst_exp_get_by_name(rq 1053 exp = rqst_exp_get_by_name(rqstp, path);
1246 } 1054 }
1247 dput(path->dentry); 1055 dput(path->dentry);
1248 path->dentry = saved; 1056 path->dentry = saved;
1249 return exp; 1057 return exp;
1250 } 1058 }
1251 1059
1252 struct svc_export *rqst_find_fsidzero_export( 1060 struct svc_export *rqst_find_fsidzero_export(struct svc_rqst *rqstp)
1253 { 1061 {
1254 u32 fsidv[2]; 1062 u32 fsidv[2];
1255 1063
1256 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NUL 1064 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);
1257 1065
1258 return rqst_exp_find(&rqstp->rq_chand !! 1066 return rqst_exp_find(rqstp, FSID_NUM, fsidv);
1259 rqstp->rq_client <<
1260 FSID_NUM, fsidv) <<
1261 } 1067 }
1262 1068
1263 /* 1069 /*
1264 * Called when we need the filehandle for the 1070 * Called when we need the filehandle for the root of the pseudofs,
1265 * for a given NFSv4 client. The root is de 1071 * for a given NFSv4 client. The root is defined to be the
1266 * export point with fsid==0 1072 * export point with fsid==0
1267 */ 1073 */
1268 __be32 1074 __be32
1269 exp_pseudoroot(struct svc_rqst *rqstp, struct 1075 exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)
1270 { 1076 {
1271 struct svc_export *exp; 1077 struct svc_export *exp;
1272 __be32 rv; 1078 __be32 rv;
1273 1079
1274 exp = rqst_find_fsidzero_export(rqstp 1080 exp = rqst_find_fsidzero_export(rqstp);
1275 if (IS_ERR(exp)) 1081 if (IS_ERR(exp))
1276 return nfserrno(PTR_ERR(exp)) 1082 return nfserrno(PTR_ERR(exp));
1277 rv = fh_compose(fhp, exp, exp->ex_pat 1083 rv = fh_compose(fhp, exp, exp->ex_path.dentry, NULL);
1278 exp_put(exp); 1084 exp_put(exp);
1279 return rv; 1085 return rv;
1280 } 1086 }
1281 1087
1282 static struct flags { 1088 static struct flags {
1283 int flag; 1089 int flag;
1284 char *name[2]; 1090 char *name[2];
1285 } expflags[] = { 1091 } expflags[] = {
1286 { NFSEXP_READONLY, {"ro", "rw"}}, 1092 { NFSEXP_READONLY, {"ro", "rw"}},
1287 { NFSEXP_INSECURE_PORT, {"insecure", 1093 { NFSEXP_INSECURE_PORT, {"insecure", ""}},
1288 { NFSEXP_ROOTSQUASH, {"root_squash", 1094 { NFSEXP_ROOTSQUASH, {"root_squash", "no_root_squash"}},
1289 { NFSEXP_ALLSQUASH, {"all_squash", "" 1095 { NFSEXP_ALLSQUASH, {"all_squash", ""}},
1290 { NFSEXP_ASYNC, {"async", "sync"}}, 1096 { NFSEXP_ASYNC, {"async", "sync"}},
1291 { NFSEXP_GATHERED_WRITES, {"wdelay", 1097 { NFSEXP_GATHERED_WRITES, {"wdelay", "no_wdelay"}},
1292 { NFSEXP_NOREADDIRPLUS, {"nordirplus" 1098 { NFSEXP_NOREADDIRPLUS, {"nordirplus", ""}},
1293 { NFSEXP_NOHIDE, {"nohide", ""}}, 1099 { NFSEXP_NOHIDE, {"nohide", ""}},
1294 { NFSEXP_CROSSMOUNT, {"crossmnt", ""} 1100 { NFSEXP_CROSSMOUNT, {"crossmnt", ""}},
1295 { NFSEXP_NOSUBTREECHECK, {"no_subtree 1101 { NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
1296 { NFSEXP_NOAUTHNLM, {"insecure_locks" 1102 { NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
1297 { NFSEXP_V4ROOT, {"v4root", ""}}, 1103 { NFSEXP_V4ROOT, {"v4root", ""}},
1298 { NFSEXP_PNFS, {"pnfs", ""}}, 1104 { NFSEXP_PNFS, {"pnfs", ""}},
1299 { NFSEXP_SECURITY_LABEL, {"security_l 1105 { NFSEXP_SECURITY_LABEL, {"security_label", ""}},
1300 { 0, {"", ""}} 1106 { 0, {"", ""}}
1301 }; 1107 };
1302 1108
1303 static void show_expflags(struct seq_file *m, 1109 static void show_expflags(struct seq_file *m, int flags, int mask)
1304 { 1110 {
1305 struct flags *flg; 1111 struct flags *flg;
1306 int state, first = 0; 1112 int state, first = 0;
1307 1113
1308 for (flg = expflags; flg->flag; flg++ 1114 for (flg = expflags; flg->flag; flg++) {
1309 if (flg->flag & ~mask) 1115 if (flg->flag & ~mask)
1310 continue; 1116 continue;
1311 state = (flg->flag & flags) ? 1117 state = (flg->flag & flags) ? 0 : 1;
1312 if (*flg->name[state]) 1118 if (*flg->name[state])
1313 seq_printf(m, "%s%s", 1119 seq_printf(m, "%s%s", first++?",":"", flg->name[state]);
1314 } 1120 }
1315 } 1121 }
1316 1122
1317 static void show_secinfo_flags(struct seq_fil 1123 static void show_secinfo_flags(struct seq_file *m, int flags)
1318 { 1124 {
1319 seq_printf(m, ","); 1125 seq_printf(m, ",");
1320 show_expflags(m, flags, NFSEXP_SECINF 1126 show_expflags(m, flags, NFSEXP_SECINFO_FLAGS);
1321 } 1127 }
1322 1128
1323 static bool secinfo_flags_equal(int f, int g) 1129 static bool secinfo_flags_equal(int f, int g)
1324 { 1130 {
1325 f &= NFSEXP_SECINFO_FLAGS; 1131 f &= NFSEXP_SECINFO_FLAGS;
1326 g &= NFSEXP_SECINFO_FLAGS; 1132 g &= NFSEXP_SECINFO_FLAGS;
1327 return f == g; 1133 return f == g;
1328 } 1134 }
1329 1135
1330 static int show_secinfo_run(struct seq_file * 1136 static int show_secinfo_run(struct seq_file *m, struct exp_flavor_info **fp, struct exp_flavor_info *end)
1331 { 1137 {
1332 int flags; 1138 int flags;
1333 1139
1334 flags = (*fp)->flags; 1140 flags = (*fp)->flags;
1335 seq_printf(m, ",sec=%d", (*fp)->pseud 1141 seq_printf(m, ",sec=%d", (*fp)->pseudoflavor);
1336 (*fp)++; 1142 (*fp)++;
1337 while (*fp != end && secinfo_flags_eq 1143 while (*fp != end && secinfo_flags_equal(flags, (*fp)->flags)) {
1338 seq_printf(m, ":%d", (*fp)->p 1144 seq_printf(m, ":%d", (*fp)->pseudoflavor);
1339 (*fp)++; 1145 (*fp)++;
1340 } 1146 }
1341 return flags; 1147 return flags;
1342 } 1148 }
1343 1149
1344 static void show_secinfo(struct seq_file *m, 1150 static void show_secinfo(struct seq_file *m, struct svc_export *exp)
1345 { 1151 {
1346 struct exp_flavor_info *f; 1152 struct exp_flavor_info *f;
1347 struct exp_flavor_info *end = exp->ex 1153 struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;
1348 int flags; 1154 int flags;
1349 1155
1350 if (exp->ex_nflavors == 0) 1156 if (exp->ex_nflavors == 0)
1351 return; 1157 return;
1352 f = exp->ex_flavors; 1158 f = exp->ex_flavors;
1353 flags = show_secinfo_run(m, &f, end); 1159 flags = show_secinfo_run(m, &f, end);
1354 if (!secinfo_flags_equal(flags, exp-> 1160 if (!secinfo_flags_equal(flags, exp->ex_flags))
1355 show_secinfo_flags(m, flags); 1161 show_secinfo_flags(m, flags);
1356 while (f != end) { 1162 while (f != end) {
1357 flags = show_secinfo_run(m, & 1163 flags = show_secinfo_run(m, &f, end);
1358 show_secinfo_flags(m, flags); 1164 show_secinfo_flags(m, flags);
1359 } 1165 }
1360 } 1166 }
1361 1167
1362 static void exp_flags(struct seq_file *m, int 1168 static void exp_flags(struct seq_file *m, int flag, int fsid,
1363 kuid_t anonu, kgid_t anong, s 1169 kuid_t anonu, kgid_t anong, struct nfsd4_fs_locations *fsloc)
1364 { 1170 {
1365 struct user_namespace *userns = m->fi <<
1366 <<
1367 show_expflags(m, flag, NFSEXP_ALLFLAG 1171 show_expflags(m, flag, NFSEXP_ALLFLAGS);
1368 if (flag & NFSEXP_FSID) 1172 if (flag & NFSEXP_FSID)
1369 seq_printf(m, ",fsid=%d", fsi 1173 seq_printf(m, ",fsid=%d", fsid);
1370 if (!uid_eq(anonu, make_kuid(userns, !! 1174 if (!uid_eq(anonu, make_kuid(&init_user_ns, (uid_t)-2)) &&
1371 !uid_eq(anonu, make_kuid(userns, !! 1175 !uid_eq(anonu, make_kuid(&init_user_ns, 0x10000-2)))
1372 seq_printf(m, ",anonuid=%u", !! 1176 seq_printf(m, ",anonuid=%u", from_kuid(&init_user_ns, anonu));
1373 if (!gid_eq(anong, make_kgid(userns, !! 1177 if (!gid_eq(anong, make_kgid(&init_user_ns, (gid_t)-2)) &&
1374 !gid_eq(anong, make_kgid(userns, !! 1178 !gid_eq(anong, make_kgid(&init_user_ns, 0x10000-2)))
1375 seq_printf(m, ",anongid=%u", !! 1179 seq_printf(m, ",anongid=%u", from_kgid(&init_user_ns, anong));
1376 if (fsloc && fsloc->locations_count > 1180 if (fsloc && fsloc->locations_count > 0) {
1377 char *loctype = (fsloc->migra 1181 char *loctype = (fsloc->migrated) ? "refer" : "replicas";
1378 int i; 1182 int i;
1379 1183
1380 seq_printf(m, ",%s=", loctype 1184 seq_printf(m, ",%s=", loctype);
1381 seq_escape(m, fsloc->location 1185 seq_escape(m, fsloc->locations[0].path, ",;@ \t\n\\");
1382 seq_putc(m, '@'); 1186 seq_putc(m, '@');
1383 seq_escape(m, fsloc->location 1187 seq_escape(m, fsloc->locations[0].hosts, ",;@ \t\n\\");
1384 for (i = 1; i < fsloc->locati 1188 for (i = 1; i < fsloc->locations_count; i++) {
1385 seq_putc(m, ';'); 1189 seq_putc(m, ';');
1386 seq_escape(m, fsloc-> 1190 seq_escape(m, fsloc->locations[i].path, ",;@ \t\n\\");
1387 seq_putc(m, '@'); 1191 seq_putc(m, '@');
1388 seq_escape(m, fsloc-> 1192 seq_escape(m, fsloc->locations[i].hosts, ",;@ \t\n\\");
1389 } 1193 }
1390 } 1194 }
1391 } 1195 }
1392 1196
1393 static int e_show(struct seq_file *m, void *p 1197 static int e_show(struct seq_file *m, void *p)
1394 { 1198 {
1395 struct cache_head *cp = p; 1199 struct cache_head *cp = p;
1396 struct svc_export *exp = container_of 1200 struct svc_export *exp = container_of(cp, struct svc_export, h);
1397 struct cache_detail *cd = m->private; 1201 struct cache_detail *cd = m->private;
1398 bool export_stats = is_export_stats_f <<
1399 1202
1400 if (p == SEQ_START_TOKEN) { 1203 if (p == SEQ_START_TOKEN) {
1401 seq_puts(m, "# Version 1.1\n" 1204 seq_puts(m, "# Version 1.1\n");
1402 if (export_stats) !! 1205 seq_puts(m, "# Path Client(Flags) # IPs\n");
1403 seq_puts(m, "# Path C <<
1404 else <<
1405 seq_puts(m, "# Path C <<
1406 return 0; 1206 return 0;
1407 } 1207 }
1408 1208
1409 exp_get(exp); 1209 exp_get(exp);
1410 if (cache_check(cd, &exp->h, NULL)) 1210 if (cache_check(cd, &exp->h, NULL))
1411 return 0; 1211 return 0;
1412 exp_put(exp); 1212 exp_put(exp);
1413 return svc_export_show(m, cd, cp); 1213 return svc_export_show(m, cd, cp);
1414 } 1214 }
1415 1215
1416 const struct seq_operations nfs_exports_op = 1216 const struct seq_operations nfs_exports_op = {
1417 .start = cache_seq_start_rcu, !! 1217 .start = cache_seq_start,
1418 .next = cache_seq_next_rcu, !! 1218 .next = cache_seq_next,
1419 .stop = cache_seq_stop_rcu, !! 1219 .stop = cache_seq_stop,
1420 .show = e_show, 1220 .show = e_show,
1421 }; 1221 };
1422 1222
1423 /* 1223 /*
1424 * Initialize the exports module. 1224 * Initialize the exports module.
1425 */ 1225 */
1426 int 1226 int
1427 nfsd_export_init(struct net *net) 1227 nfsd_export_init(struct net *net)
1428 { 1228 {
1429 int rv; 1229 int rv;
1430 struct nfsd_net *nn = net_generic(net 1230 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
1431 1231
1432 dprintk("nfsd: initializing export mo !! 1232 dprintk("nfsd: initializing export module (net: %p).\n", net);
1433 1233
1434 nn->svc_export_cache = cache_create_n 1234 nn->svc_export_cache = cache_create_net(&svc_export_cache_template, net);
1435 if (IS_ERR(nn->svc_export_cache)) 1235 if (IS_ERR(nn->svc_export_cache))
1436 return PTR_ERR(nn->svc_export 1236 return PTR_ERR(nn->svc_export_cache);
1437 rv = cache_register_net(nn->svc_expor 1237 rv = cache_register_net(nn->svc_export_cache, net);
1438 if (rv) 1238 if (rv)
1439 goto destroy_export_cache; 1239 goto destroy_export_cache;
1440 1240
1441 nn->svc_expkey_cache = cache_create_n 1241 nn->svc_expkey_cache = cache_create_net(&svc_expkey_cache_template, net);
1442 if (IS_ERR(nn->svc_expkey_cache)) { 1242 if (IS_ERR(nn->svc_expkey_cache)) {
1443 rv = PTR_ERR(nn->svc_expkey_c 1243 rv = PTR_ERR(nn->svc_expkey_cache);
1444 goto unregister_export_cache; 1244 goto unregister_export_cache;
1445 } 1245 }
1446 rv = cache_register_net(nn->svc_expke 1246 rv = cache_register_net(nn->svc_expkey_cache, net);
1447 if (rv) 1247 if (rv)
1448 goto destroy_expkey_cache; 1248 goto destroy_expkey_cache;
1449 return 0; 1249 return 0;
1450 1250
1451 destroy_expkey_cache: 1251 destroy_expkey_cache:
1452 cache_destroy_net(nn->svc_expkey_cach 1252 cache_destroy_net(nn->svc_expkey_cache, net);
1453 unregister_export_cache: 1253 unregister_export_cache:
1454 cache_unregister_net(nn->svc_export_c 1254 cache_unregister_net(nn->svc_export_cache, net);
1455 destroy_export_cache: 1255 destroy_export_cache:
1456 cache_destroy_net(nn->svc_export_cach 1256 cache_destroy_net(nn->svc_export_cache, net);
1457 return rv; 1257 return rv;
1458 } 1258 }
1459 1259
1460 /* 1260 /*
1461 * Flush exports table - called when last nfs 1261 * Flush exports table - called when last nfsd thread is killed
1462 */ 1262 */
1463 void 1263 void
1464 nfsd_export_flush(struct net *net) 1264 nfsd_export_flush(struct net *net)
1465 { 1265 {
1466 struct nfsd_net *nn = net_generic(net 1266 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
1467 1267
1468 cache_purge(nn->svc_expkey_cache); 1268 cache_purge(nn->svc_expkey_cache);
1469 cache_purge(nn->svc_export_cache); 1269 cache_purge(nn->svc_export_cache);
1470 } 1270 }
1471 1271
1472 /* 1272 /*
1473 * Shutdown the exports module. 1273 * Shutdown the exports module.
1474 */ 1274 */
1475 void 1275 void
1476 nfsd_export_shutdown(struct net *net) 1276 nfsd_export_shutdown(struct net *net)
1477 { 1277 {
1478 struct nfsd_net *nn = net_generic(net 1278 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
1479 1279
1480 dprintk("nfsd: shutting down export m !! 1280 dprintk("nfsd: shutting down export module (net: %p).\n", net);
1481 1281
1482 cache_unregister_net(nn->svc_expkey_c 1282 cache_unregister_net(nn->svc_expkey_cache, net);
1483 cache_unregister_net(nn->svc_export_c 1283 cache_unregister_net(nn->svc_export_cache, net);
1484 cache_destroy_net(nn->svc_expkey_cach 1284 cache_destroy_net(nn->svc_expkey_cache, net);
1485 cache_destroy_net(nn->svc_export_cach 1285 cache_destroy_net(nn->svc_export_cache, net);
1486 svcauth_unix_purge(net); 1286 svcauth_unix_purge(net);
1487 1287
1488 dprintk("nfsd: export shutdown comple !! 1288 dprintk("nfsd: export shutdown complete (net: %p).\n", net);
1489 } 1289 }
1490 1290
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.