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