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 334 static int export_stats_init(struct export_stats *stats)
335 { 335 {
336 stats->start_time = ktime_get_seconds( 336 stats->start_time = ktime_get_seconds();
337 return percpu_counter_init_many(stats- !! 337 return nfsd_percpu_counters_init(stats->counter, EXP_STATS_COUNTERS_NUM);
338 EXP_ST <<
339 } 338 }
340 339
341 static void export_stats_reset(struct export_s 340 static void export_stats_reset(struct export_stats *stats)
342 { 341 {
343 if (stats) { !! 342 nfsd_percpu_counters_reset(stats->counter, EXP_STATS_COUNTERS_NUM);
344 int i; <<
345 <<
346 for (i = 0; i < EXP_STATS_COUN <<
347 percpu_counter_set(&st <<
348 } <<
349 } 343 }
350 344
351 static void export_stats_destroy(struct export 345 static void export_stats_destroy(struct export_stats *stats)
352 { 346 {
353 if (stats) !! 347 nfsd_percpu_counters_destroy(stats->counter, EXP_STATS_COUNTERS_NUM);
354 percpu_counter_destroy_many(st <<
355 EX <<
356 } 348 }
357 349
358 static void svc_export_put(struct kref *ref) 350 static void svc_export_put(struct kref *ref)
359 { 351 {
360 struct svc_export *exp = container_of( 352 struct svc_export *exp = container_of(ref, struct svc_export, h.ref);
361 path_put(&exp->ex_path); 353 path_put(&exp->ex_path);
362 auth_domain_put(exp->ex_client); 354 auth_domain_put(exp->ex_client);
363 nfsd4_fslocs_free(&exp->ex_fslocs); 355 nfsd4_fslocs_free(&exp->ex_fslocs);
364 export_stats_destroy(exp->ex_stats); !! 356 export_stats_destroy(&exp->ex_stats);
365 kfree(exp->ex_stats); <<
366 kfree(exp->ex_uuid); 357 kfree(exp->ex_uuid);
367 kfree_rcu(exp, ex_rcu); 358 kfree_rcu(exp, ex_rcu);
368 } 359 }
369 360
370 static int svc_export_upcall(struct cache_deta 361 static int svc_export_upcall(struct cache_detail *cd, struct cache_head *h)
371 { 362 {
372 return sunrpc_cache_pipe_upcall(cd, h) 363 return sunrpc_cache_pipe_upcall(cd, h);
373 } 364 }
374 365
375 static void svc_export_request(struct cache_de 366 static void svc_export_request(struct cache_detail *cd,
376 struct cache_he 367 struct cache_head *h,
377 char **bpp, int 368 char **bpp, int *blen)
378 { 369 {
379 /* client path */ 370 /* client path */
380 struct svc_export *exp = container_of( 371 struct svc_export *exp = container_of(h, struct svc_export, h);
381 char *pth; 372 char *pth;
382 373
383 qword_add(bpp, blen, exp->ex_client->n 374 qword_add(bpp, blen, exp->ex_client->name);
384 pth = d_path(&exp->ex_path, *bpp, *ble 375 pth = d_path(&exp->ex_path, *bpp, *blen);
385 if (IS_ERR(pth)) { 376 if (IS_ERR(pth)) {
386 /* is this correct? */ 377 /* is this correct? */
387 (*bpp)[0] = '\n'; 378 (*bpp)[0] = '\n';
388 return; 379 return;
389 } 380 }
390 qword_add(bpp, blen, pth); 381 qword_add(bpp, blen, pth);
391 (*bpp)[-1] = '\n'; 382 (*bpp)[-1] = '\n';
392 } 383 }
393 384
394 static struct svc_export *svc_export_update(st 385 static struct svc_export *svc_export_update(struct svc_export *new,
395 st 386 struct svc_export *old);
396 static struct svc_export *svc_export_lookup(st 387 static struct svc_export *svc_export_lookup(struct svc_export *);
397 388
398 static int check_export(struct path *path, int 389 static int check_export(struct path *path, int *flags, unsigned char *uuid)
399 { 390 {
400 struct inode *inode = d_inode(path->de 391 struct inode *inode = d_inode(path->dentry);
401 392
402 /* 393 /*
403 * We currently export only dirs, regu 394 * We currently export only dirs, regular files, and (for v4
404 * pseudoroot) symlinks. 395 * pseudoroot) symlinks.
405 */ 396 */
406 if (!S_ISDIR(inode->i_mode) && 397 if (!S_ISDIR(inode->i_mode) &&
407 !S_ISLNK(inode->i_mode) && 398 !S_ISLNK(inode->i_mode) &&
408 !S_ISREG(inode->i_mode)) 399 !S_ISREG(inode->i_mode))
409 return -ENOTDIR; 400 return -ENOTDIR;
410 401
411 /* 402 /*
412 * Mountd should never pass down a wri 403 * Mountd should never pass down a writeable V4ROOT export, but,
413 * just to make sure: 404 * just to make sure:
414 */ 405 */
415 if (*flags & NFSEXP_V4ROOT) 406 if (*flags & NFSEXP_V4ROOT)
416 *flags |= NFSEXP_READONLY; 407 *flags |= NFSEXP_READONLY;
417 408
418 /* There are two requirements on a fil 409 /* There are two requirements on a filesystem to be exportable.
419 * 1: We must be able to identify the 410 * 1: We must be able to identify the filesystem from a number.
420 * either a device number (so FS 411 * either a device number (so FS_REQUIRES_DEV needed)
421 * or an FSID number (so NFSEXP_ 412 * or an FSID number (so NFSEXP_FSID or ->uuid is needed).
422 * 2: We must be able to find an inod 413 * 2: We must be able to find an inode from a filehandle.
423 * This means that s_export_op m 414 * This means that s_export_op must be set.
424 * 3: We must not currently be on an i 415 * 3: We must not currently be on an idmapped mount.
425 */ 416 */
426 if (!(inode->i_sb->s_type->fs_flags & 417 if (!(inode->i_sb->s_type->fs_flags & FS_REQUIRES_DEV) &&
427 !(*flags & NFSEXP_FSID) && 418 !(*flags & NFSEXP_FSID) &&
428 uuid == NULL) { 419 uuid == NULL) {
429 dprintk("exp_export: export of 420 dprintk("exp_export: export of non-dev fs without fsid\n");
430 return -EINVAL; 421 return -EINVAL;
431 } 422 }
432 423
433 if (!exportfs_can_decode_fh(inode->i_s !! 424 if (!inode->i_sb->s_export_op ||
>> 425 !inode->i_sb->s_export_op->fh_to_dentry) {
434 dprintk("exp_export: export of 426 dprintk("exp_export: export of invalid fs type.\n");
435 return -EINVAL; 427 return -EINVAL;
436 } 428 }
437 429
438 if (is_idmapped_mnt(path->mnt)) { !! 430 if (mnt_user_ns(path->mnt) != &init_user_ns) {
439 dprintk("exp_export: export of 431 dprintk("exp_export: export of idmapped mounts not yet supported.\n");
440 return -EINVAL; 432 return -EINVAL;
441 } 433 }
442 434
443 if (inode->i_sb->s_export_op->flags & 435 if (inode->i_sb->s_export_op->flags & EXPORT_OP_NOSUBTREECHK &&
444 !(*flags & NFSEXP_NOSUBTREECHECK)) 436 !(*flags & NFSEXP_NOSUBTREECHECK)) {
445 dprintk("%s: %s does not suppo 437 dprintk("%s: %s does not support subtree checking!\n",
446 __func__, inode->i_sb- 438 __func__, inode->i_sb->s_type->name);
447 return -EINVAL; 439 return -EINVAL;
448 } 440 }
449 return 0; 441 return 0;
>> 442
450 } 443 }
451 444
452 #ifdef CONFIG_NFSD_V4 445 #ifdef CONFIG_NFSD_V4
453 446
454 static int 447 static int
455 fsloc_parse(char **mesg, char *buf, struct nfs 448 fsloc_parse(char **mesg, char *buf, struct nfsd4_fs_locations *fsloc)
456 { 449 {
457 int len; 450 int len;
458 int migrated, i, err; 451 int migrated, i, err;
459 452
460 /* more than one fsloc */ 453 /* more than one fsloc */
461 if (fsloc->locations) 454 if (fsloc->locations)
462 return -EINVAL; 455 return -EINVAL;
463 456
464 /* listsize */ 457 /* listsize */
465 err = get_uint(mesg, &fsloc->locations 458 err = get_uint(mesg, &fsloc->locations_count);
466 if (err) 459 if (err)
467 return err; 460 return err;
468 if (fsloc->locations_count > MAX_FS_LO 461 if (fsloc->locations_count > MAX_FS_LOCATIONS)
469 return -EINVAL; 462 return -EINVAL;
470 if (fsloc->locations_count == 0) 463 if (fsloc->locations_count == 0)
471 return 0; 464 return 0;
472 465
473 fsloc->locations = kcalloc(fsloc->loca 466 fsloc->locations = kcalloc(fsloc->locations_count,
474 sizeof(stru 467 sizeof(struct nfsd4_fs_location),
475 GFP_KERNEL) 468 GFP_KERNEL);
476 if (!fsloc->locations) 469 if (!fsloc->locations)
477 return -ENOMEM; 470 return -ENOMEM;
478 for (i=0; i < fsloc->locations_count; 471 for (i=0; i < fsloc->locations_count; i++) {
479 /* colon separated host list * 472 /* colon separated host list */
480 err = -EINVAL; 473 err = -EINVAL;
481 len = qword_get(mesg, buf, PAG 474 len = qword_get(mesg, buf, PAGE_SIZE);
482 if (len <= 0) 475 if (len <= 0)
483 goto out_free_all; 476 goto out_free_all;
484 err = -ENOMEM; 477 err = -ENOMEM;
485 fsloc->locations[i].hosts = ks 478 fsloc->locations[i].hosts = kstrdup(buf, GFP_KERNEL);
486 if (!fsloc->locations[i].hosts 479 if (!fsloc->locations[i].hosts)
487 goto out_free_all; 480 goto out_free_all;
488 err = -EINVAL; 481 err = -EINVAL;
489 /* slash separated path compon 482 /* slash separated path component list */
490 len = qword_get(mesg, buf, PAG 483 len = qword_get(mesg, buf, PAGE_SIZE);
491 if (len <= 0) 484 if (len <= 0)
492 goto out_free_all; 485 goto out_free_all;
493 err = -ENOMEM; 486 err = -ENOMEM;
494 fsloc->locations[i].path = kst 487 fsloc->locations[i].path = kstrdup(buf, GFP_KERNEL);
495 if (!fsloc->locations[i].path) 488 if (!fsloc->locations[i].path)
496 goto out_free_all; 489 goto out_free_all;
497 } 490 }
498 /* migrated */ 491 /* migrated */
499 err = get_int(mesg, &migrated); 492 err = get_int(mesg, &migrated);
500 if (err) 493 if (err)
501 goto out_free_all; 494 goto out_free_all;
502 err = -EINVAL; 495 err = -EINVAL;
503 if (migrated < 0 || migrated > 1) 496 if (migrated < 0 || migrated > 1)
504 goto out_free_all; 497 goto out_free_all;
505 fsloc->migrated = migrated; 498 fsloc->migrated = migrated;
506 return 0; 499 return 0;
507 out_free_all: 500 out_free_all:
508 nfsd4_fslocs_free(fsloc); 501 nfsd4_fslocs_free(fsloc);
509 return err; 502 return err;
510 } 503 }
511 504
512 static int secinfo_parse(char **mesg, char *bu 505 static int secinfo_parse(char **mesg, char *buf, struct svc_export *exp)
513 { 506 {
514 struct exp_flavor_info *f; 507 struct exp_flavor_info *f;
515 u32 listsize; 508 u32 listsize;
516 int err; 509 int err;
517 510
518 /* more than one secinfo */ 511 /* more than one secinfo */
519 if (exp->ex_nflavors) 512 if (exp->ex_nflavors)
520 return -EINVAL; 513 return -EINVAL;
521 514
522 err = get_uint(mesg, &listsize); 515 err = get_uint(mesg, &listsize);
523 if (err) 516 if (err)
524 return err; 517 return err;
525 if (listsize > MAX_SECINFO_LIST) 518 if (listsize > MAX_SECINFO_LIST)
526 return -EINVAL; 519 return -EINVAL;
527 520
528 for (f = exp->ex_flavors; f < exp->ex_ 521 for (f = exp->ex_flavors; f < exp->ex_flavors + listsize; f++) {
529 err = get_uint(mesg, &f->pseud 522 err = get_uint(mesg, &f->pseudoflavor);
530 if (err) 523 if (err)
531 return err; 524 return err;
532 /* 525 /*
533 * XXX: It would be nice to al 526 * XXX: It would be nice to also check whether this
534 * pseudoflavor is supported, 527 * pseudoflavor is supported, so we can discover the
535 * problem at export time inst 528 * problem at export time instead of when a client fails
536 * to authenticate. 529 * to authenticate.
537 */ 530 */
538 err = get_uint(mesg, &f->flags 531 err = get_uint(mesg, &f->flags);
539 if (err) 532 if (err)
540 return err; 533 return err;
541 /* Only some flags are allowed 534 /* Only some flags are allowed to differ between flavors: */
542 if (~NFSEXP_SECINFO_FLAGS & (f 535 if (~NFSEXP_SECINFO_FLAGS & (f->flags ^ exp->ex_flags))
543 return -EINVAL; 536 return -EINVAL;
544 } 537 }
545 exp->ex_nflavors = listsize; 538 exp->ex_nflavors = listsize;
546 return 0; 539 return 0;
547 } 540 }
548 541
549 #else /* CONFIG_NFSD_V4 */ 542 #else /* CONFIG_NFSD_V4 */
550 static inline int 543 static inline int
551 fsloc_parse(char **mesg, char *buf, struct nfs 544 fsloc_parse(char **mesg, char *buf, struct nfsd4_fs_locations *fsloc){return 0;}
552 static inline int 545 static inline int
553 secinfo_parse(char **mesg, char *buf, struct s 546 secinfo_parse(char **mesg, char *buf, struct svc_export *exp) { return 0; }
554 #endif 547 #endif
555 548
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 549 static inline int
580 nfsd_uuid_parse(char **mesg, char *buf, unsign 550 nfsd_uuid_parse(char **mesg, char *buf, unsigned char **puuid)
581 { 551 {
582 int len; 552 int len;
583 553
584 /* more than one uuid */ 554 /* more than one uuid */
585 if (*puuid) 555 if (*puuid)
586 return -EINVAL; 556 return -EINVAL;
587 557
588 /* expect a 16 byte uuid encoded as \x 558 /* expect a 16 byte uuid encoded as \xXXXX... */
589 len = qword_get(mesg, buf, PAGE_SIZE); 559 len = qword_get(mesg, buf, PAGE_SIZE);
590 if (len != EX_UUID_LEN) 560 if (len != EX_UUID_LEN)
591 return -EINVAL; 561 return -EINVAL;
592 562
593 *puuid = kmemdup(buf, EX_UUID_LEN, GFP 563 *puuid = kmemdup(buf, EX_UUID_LEN, GFP_KERNEL);
594 if (*puuid == NULL) 564 if (*puuid == NULL)
595 return -ENOMEM; 565 return -ENOMEM;
596 566
597 return 0; 567 return 0;
598 } 568 }
599 569
600 static int svc_export_parse(struct cache_detai 570 static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
601 { 571 {
602 /* client path expiry [flags anonuid a 572 /* client path expiry [flags anonuid anongid fsid] */
603 char *buf; 573 char *buf;
>> 574 int len;
604 int err; 575 int err;
605 struct auth_domain *dom = NULL; 576 struct auth_domain *dom = NULL;
606 struct svc_export exp = {}, *expp; 577 struct svc_export exp = {}, *expp;
607 int an_int; 578 int an_int;
608 579
609 if (mesg[mlen-1] != '\n') 580 if (mesg[mlen-1] != '\n')
610 return -EINVAL; 581 return -EINVAL;
611 mesg[mlen-1] = 0; 582 mesg[mlen-1] = 0;
612 583
613 buf = kmalloc(PAGE_SIZE, GFP_KERNEL); 584 buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
614 if (!buf) 585 if (!buf)
615 return -ENOMEM; 586 return -ENOMEM;
616 587
617 /* client */ 588 /* client */
618 err = -EINVAL; 589 err = -EINVAL;
619 if (qword_get(&mesg, buf, PAGE_SIZE) < !! 590 len = qword_get(&mesg, buf, PAGE_SIZE);
>> 591 if (len <= 0)
620 goto out; 592 goto out;
621 593
622 err = -ENOENT; 594 err = -ENOENT;
623 dom = auth_domain_find(buf); 595 dom = auth_domain_find(buf);
624 if (!dom) 596 if (!dom)
625 goto out; 597 goto out;
626 598
627 /* path */ 599 /* path */
628 err = -EINVAL; 600 err = -EINVAL;
629 if (qword_get(&mesg, buf, PAGE_SIZE) < !! 601 if ((len = qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
630 goto out1; 602 goto out1;
631 603
632 err = kern_path(buf, 0, &exp.ex_path); 604 err = kern_path(buf, 0, &exp.ex_path);
633 if (err) 605 if (err)
634 goto out1; 606 goto out1;
635 607
636 exp.ex_client = dom; 608 exp.ex_client = dom;
637 exp.cd = cd; 609 exp.cd = cd;
638 exp.ex_devid_map = NULL; 610 exp.ex_devid_map = NULL;
639 exp.ex_xprtsec_modes = NFSEXP_XPRTSEC_ <<
640 611
641 /* expiry */ 612 /* expiry */
642 err = get_expiry(&mesg, &exp.h.expiry_ !! 613 err = -EINVAL;
643 if (err) !! 614 exp.h.expiry_time = get_expiry(&mesg);
>> 615 if (exp.h.expiry_time == 0)
644 goto out3; 616 goto out3;
645 617
646 /* flags */ 618 /* flags */
647 err = get_int(&mesg, &an_int); 619 err = get_int(&mesg, &an_int);
648 if (err == -ENOENT) { 620 if (err == -ENOENT) {
649 err = 0; 621 err = 0;
650 set_bit(CACHE_NEGATIVE, &exp.h 622 set_bit(CACHE_NEGATIVE, &exp.h.flags);
651 } else { 623 } else {
652 if (err || an_int < 0) 624 if (err || an_int < 0)
653 goto out3; 625 goto out3;
654 exp.ex_flags= an_int; 626 exp.ex_flags= an_int;
655 !! 627
656 /* anon uid */ 628 /* anon uid */
657 err = get_int(&mesg, &an_int); 629 err = get_int(&mesg, &an_int);
658 if (err) 630 if (err)
659 goto out3; 631 goto out3;
660 exp.ex_anon_uid= make_kuid(cur 632 exp.ex_anon_uid= make_kuid(current_user_ns(), an_int);
661 633
662 /* anon gid */ 634 /* anon gid */
663 err = get_int(&mesg, &an_int); 635 err = get_int(&mesg, &an_int);
664 if (err) 636 if (err)
665 goto out3; 637 goto out3;
666 exp.ex_anon_gid= make_kgid(cur 638 exp.ex_anon_gid= make_kgid(current_user_ns(), an_int);
667 639
668 /* fsid */ 640 /* fsid */
669 err = get_int(&mesg, &an_int); 641 err = get_int(&mesg, &an_int);
670 if (err) 642 if (err)
671 goto out3; 643 goto out3;
672 exp.ex_fsid = an_int; 644 exp.ex_fsid = an_int;
673 645
674 while (qword_get(&mesg, buf, P !! 646 while ((len = qword_get(&mesg, buf, PAGE_SIZE)) > 0) {
675 if (strcmp(buf, "fsloc 647 if (strcmp(buf, "fsloc") == 0)
676 err = fsloc_pa 648 err = fsloc_parse(&mesg, buf, &exp.ex_fslocs);
677 else if (strcmp(buf, " 649 else if (strcmp(buf, "uuid") == 0)
678 err = nfsd_uui 650 err = nfsd_uuid_parse(&mesg, buf, &exp.ex_uuid);
679 else if (strcmp(buf, " 651 else if (strcmp(buf, "secinfo") == 0)
680 err = secinfo_ 652 err = secinfo_parse(&mesg, buf, &exp);
681 else if (strcmp(buf, " <<
682 err = xprtsec_ <<
683 else 653 else
684 /* quietly ign 654 /* quietly ignore unknown words and anything
685 * following. 655 * following. Newer user-space can try to set
686 * new values, 656 * new values, then see what the result was.
687 */ 657 */
688 break; 658 break;
689 if (err) 659 if (err)
690 goto out4; 660 goto out4;
691 } 661 }
692 662
693 err = check_export(&exp.ex_pat 663 err = check_export(&exp.ex_path, &exp.ex_flags, exp.ex_uuid);
694 if (err) 664 if (err)
695 goto out4; 665 goto out4;
696 <<
697 /* 666 /*
698 * No point caching this if it 667 * No point caching this if it would immediately expire.
699 * Also, this protects exportf 668 * Also, this protects exportfs's dummy export from the
700 * anon_uid/anon_gid checks: 669 * anon_uid/anon_gid checks:
701 */ 670 */
702 if (exp.h.expiry_time < second 671 if (exp.h.expiry_time < seconds_since_boot())
703 goto out4; 672 goto out4;
704 /* 673 /*
705 * For some reason exportfs ha 674 * For some reason exportfs has been passing down an
706 * invalid (-1) uid & gid on t 675 * invalid (-1) uid & gid on the "dummy" export which it
707 * uses to test export support 676 * uses to test export support. To make sure exportfs
708 * sees errors from check_expo 677 * sees errors from check_export we therefore need to
709 * delay these checks till aft 678 * delay these checks till after check_export:
710 */ 679 */
711 err = -EINVAL; 680 err = -EINVAL;
712 if (!uid_valid(exp.ex_anon_uid 681 if (!uid_valid(exp.ex_anon_uid))
713 goto out4; 682 goto out4;
714 if (!gid_valid(exp.ex_anon_gid 683 if (!gid_valid(exp.ex_anon_gid))
715 goto out4; 684 goto out4;
716 err = 0; 685 err = 0;
717 686
718 nfsd4_setup_layout_type(&exp); 687 nfsd4_setup_layout_type(&exp);
719 } 688 }
720 689
721 expp = svc_export_lookup(&exp); 690 expp = svc_export_lookup(&exp);
722 if (!expp) { 691 if (!expp) {
723 err = -ENOMEM; 692 err = -ENOMEM;
724 goto out4; 693 goto out4;
725 } 694 }
726 expp = svc_export_update(&exp, expp); 695 expp = svc_export_update(&exp, expp);
727 if (expp) { 696 if (expp) {
728 trace_nfsd_export_update(expp) 697 trace_nfsd_export_update(expp);
729 cache_flush(); 698 cache_flush();
730 exp_put(expp); 699 exp_put(expp);
731 } else 700 } else
732 err = -ENOMEM; 701 err = -ENOMEM;
733 out4: 702 out4:
734 nfsd4_fslocs_free(&exp.ex_fslocs); 703 nfsd4_fslocs_free(&exp.ex_fslocs);
735 kfree(exp.ex_uuid); 704 kfree(exp.ex_uuid);
736 out3: 705 out3:
737 path_put(&exp.ex_path); 706 path_put(&exp.ex_path);
738 out1: 707 out1:
739 auth_domain_put(dom); 708 auth_domain_put(dom);
740 out: 709 out:
741 kfree(buf); 710 kfree(buf);
742 return err; 711 return err;
743 } 712 }
744 713
745 static void exp_flags(struct seq_file *m, int 714 static void exp_flags(struct seq_file *m, int flag, int fsid,
746 kuid_t anonu, kgid_t anong, st 715 kuid_t anonu, kgid_t anong, struct nfsd4_fs_locations *fslocs);
747 static void show_secinfo(struct seq_file *m, s 716 static void show_secinfo(struct seq_file *m, struct svc_export *exp);
748 717
749 static int is_export_stats_file(struct seq_fil 718 static int is_export_stats_file(struct seq_file *m)
750 { 719 {
751 /* 720 /*
752 * The export_stats file uses the same 721 * The export_stats file uses the same ops as the exports file.
753 * We use the file's name to determine 722 * We use the file's name to determine the reported info per export.
754 * There is no rename in nsfdfs, so d_ 723 * There is no rename in nsfdfs, so d_name.name is stable.
755 */ 724 */
756 return !strcmp(m->file->f_path.dentry- 725 return !strcmp(m->file->f_path.dentry->d_name.name, "export_stats");
757 } 726 }
758 727
759 static int svc_export_show(struct seq_file *m, 728 static int svc_export_show(struct seq_file *m,
760 struct cache_detail 729 struct cache_detail *cd,
761 struct cache_head * 730 struct cache_head *h)
762 { 731 {
763 struct svc_export *exp; 732 struct svc_export *exp;
764 bool export_stats = is_export_stats_fi 733 bool export_stats = is_export_stats_file(m);
765 734
766 if (h == NULL) { 735 if (h == NULL) {
767 if (export_stats) 736 if (export_stats)
768 seq_puts(m, "#path dom 737 seq_puts(m, "#path domain start-time\n#\tstats\n");
769 else 738 else
770 seq_puts(m, "#path dom 739 seq_puts(m, "#path domain(flags)\n");
771 return 0; 740 return 0;
772 } 741 }
773 exp = container_of(h, struct svc_expor 742 exp = container_of(h, struct svc_export, h);
774 seq_path(m, &exp->ex_path, " \t\n\\"); 743 seq_path(m, &exp->ex_path, " \t\n\\");
775 seq_putc(m, '\t'); 744 seq_putc(m, '\t');
776 seq_escape(m, exp->ex_client->name, " 745 seq_escape(m, exp->ex_client->name, " \t\n\\");
777 if (export_stats) { 746 if (export_stats) {
778 struct percpu_counter *counter !! 747 seq_printf(m, "\t%lld\n", exp->ex_stats.start_time);
779 <<
780 seq_printf(m, "\t%lld\n", exp- <<
781 seq_printf(m, "\tfh_stale: %ll 748 seq_printf(m, "\tfh_stale: %lld\n",
782 percpu_counter_sum_ !! 749 percpu_counter_sum_positive(&exp->ex_stats.counter[EXP_STATS_FH_STALE]));
783 seq_printf(m, "\tio_read: %lld 750 seq_printf(m, "\tio_read: %lld\n",
784 percpu_counter_sum_ !! 751 percpu_counter_sum_positive(&exp->ex_stats.counter[EXP_STATS_IO_READ]));
785 seq_printf(m, "\tio_write: %ll 752 seq_printf(m, "\tio_write: %lld\n",
786 percpu_counter_sum_ !! 753 percpu_counter_sum_positive(&exp->ex_stats.counter[EXP_STATS_IO_WRITE]));
787 seq_putc(m, '\n'); 754 seq_putc(m, '\n');
788 return 0; 755 return 0;
789 } 756 }
790 seq_putc(m, '('); 757 seq_putc(m, '(');
791 if (test_bit(CACHE_VALID, &h->flags) & 758 if (test_bit(CACHE_VALID, &h->flags) &&
792 !test_bit(CACHE_NEGATIVE, &h->flag 759 !test_bit(CACHE_NEGATIVE, &h->flags)) {
793 exp_flags(m, exp->ex_flags, ex 760 exp_flags(m, exp->ex_flags, exp->ex_fsid,
794 exp->ex_anon_uid, ex 761 exp->ex_anon_uid, exp->ex_anon_gid, &exp->ex_fslocs);
795 if (exp->ex_uuid) { 762 if (exp->ex_uuid) {
796 int i; 763 int i;
797 seq_puts(m, ",uuid="); 764 seq_puts(m, ",uuid=");
798 for (i = 0; i < EX_UUI 765 for (i = 0; i < EX_UUID_LEN; i++) {
799 if ((i&3) == 0 766 if ((i&3) == 0 && i)
800 seq_pu 767 seq_putc(m, ':');
801 seq_printf(m, 768 seq_printf(m, "%02x", exp->ex_uuid[i]);
802 } 769 }
803 } 770 }
804 show_secinfo(m, exp); 771 show_secinfo(m, exp);
805 } 772 }
806 seq_puts(m, ")\n"); 773 seq_puts(m, ")\n");
807 return 0; 774 return 0;
808 } 775 }
809 static int svc_export_match(struct cache_head 776 static int svc_export_match(struct cache_head *a, struct cache_head *b)
810 { 777 {
811 struct svc_export *orig = container_of 778 struct svc_export *orig = container_of(a, struct svc_export, h);
812 struct svc_export *new = container_of( 779 struct svc_export *new = container_of(b, struct svc_export, h);
813 return orig->ex_client == new->ex_clie 780 return orig->ex_client == new->ex_client &&
814 path_equal(&orig->ex_path, &ne 781 path_equal(&orig->ex_path, &new->ex_path);
815 } 782 }
816 783
817 static void svc_export_init(struct cache_head 784 static void svc_export_init(struct cache_head *cnew, struct cache_head *citem)
818 { 785 {
819 struct svc_export *new = container_of( 786 struct svc_export *new = container_of(cnew, struct svc_export, h);
820 struct svc_export *item = container_of 787 struct svc_export *item = container_of(citem, struct svc_export, h);
821 788
822 kref_get(&item->ex_client->ref); 789 kref_get(&item->ex_client->ref);
823 new->ex_client = item->ex_client; 790 new->ex_client = item->ex_client;
824 new->ex_path = item->ex_path; 791 new->ex_path = item->ex_path;
825 path_get(&item->ex_path); 792 path_get(&item->ex_path);
826 new->ex_fslocs.locations = NULL; 793 new->ex_fslocs.locations = NULL;
827 new->ex_fslocs.locations_count = 0; 794 new->ex_fslocs.locations_count = 0;
828 new->ex_fslocs.migrated = 0; 795 new->ex_fslocs.migrated = 0;
829 new->ex_layout_types = 0; 796 new->ex_layout_types = 0;
830 new->ex_uuid = NULL; 797 new->ex_uuid = NULL;
831 new->cd = item->cd; 798 new->cd = item->cd;
832 export_stats_reset(new->ex_stats); !! 799 export_stats_reset(&new->ex_stats);
833 } 800 }
834 801
835 static void export_update(struct cache_head *c 802 static void export_update(struct cache_head *cnew, struct cache_head *citem)
836 { 803 {
837 struct svc_export *new = container_of( 804 struct svc_export *new = container_of(cnew, struct svc_export, h);
838 struct svc_export *item = container_of 805 struct svc_export *item = container_of(citem, struct svc_export, h);
839 int i; 806 int i;
840 807
841 new->ex_flags = item->ex_flags; 808 new->ex_flags = item->ex_flags;
842 new->ex_anon_uid = item->ex_anon_uid; 809 new->ex_anon_uid = item->ex_anon_uid;
843 new->ex_anon_gid = item->ex_anon_gid; 810 new->ex_anon_gid = item->ex_anon_gid;
844 new->ex_fsid = item->ex_fsid; 811 new->ex_fsid = item->ex_fsid;
845 new->ex_devid_map = item->ex_devid_map 812 new->ex_devid_map = item->ex_devid_map;
846 item->ex_devid_map = NULL; 813 item->ex_devid_map = NULL;
847 new->ex_uuid = item->ex_uuid; 814 new->ex_uuid = item->ex_uuid;
848 item->ex_uuid = NULL; 815 item->ex_uuid = NULL;
849 new->ex_fslocs.locations = item->ex_fs 816 new->ex_fslocs.locations = item->ex_fslocs.locations;
850 item->ex_fslocs.locations = NULL; 817 item->ex_fslocs.locations = NULL;
851 new->ex_fslocs.locations_count = item- 818 new->ex_fslocs.locations_count = item->ex_fslocs.locations_count;
852 item->ex_fslocs.locations_count = 0; 819 item->ex_fslocs.locations_count = 0;
853 new->ex_fslocs.migrated = item->ex_fsl 820 new->ex_fslocs.migrated = item->ex_fslocs.migrated;
854 item->ex_fslocs.migrated = 0; 821 item->ex_fslocs.migrated = 0;
855 new->ex_layout_types = item->ex_layout 822 new->ex_layout_types = item->ex_layout_types;
856 new->ex_nflavors = item->ex_nflavors; 823 new->ex_nflavors = item->ex_nflavors;
857 for (i = 0; i < MAX_SECINFO_LIST; i++) 824 for (i = 0; i < MAX_SECINFO_LIST; i++) {
858 new->ex_flavors[i] = item->ex_ 825 new->ex_flavors[i] = item->ex_flavors[i];
859 } 826 }
860 new->ex_xprtsec_modes = item->ex_xprts <<
861 } 827 }
862 828
863 static struct cache_head *svc_export_alloc(voi 829 static struct cache_head *svc_export_alloc(void)
864 { 830 {
865 struct svc_export *i = kmalloc(sizeof( 831 struct svc_export *i = kmalloc(sizeof(*i), GFP_KERNEL);
866 if (!i) 832 if (!i)
867 return NULL; 833 return NULL;
868 834
869 i->ex_stats = kmalloc(sizeof(*(i->ex_s !! 835 if (export_stats_init(&i->ex_stats)) {
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); 836 kfree(i);
878 return NULL; 837 return NULL;
879 } 838 }
880 839
881 return &i->h; 840 return &i->h;
882 } 841 }
883 842
884 static const struct cache_detail svc_export_ca 843 static const struct cache_detail svc_export_cache_template = {
885 .owner = THIS_MODULE, 844 .owner = THIS_MODULE,
886 .hash_size = EXPORT_HASHMAX, 845 .hash_size = EXPORT_HASHMAX,
887 .name = "nfsd.export", 846 .name = "nfsd.export",
888 .cache_put = svc_export_put, 847 .cache_put = svc_export_put,
889 .cache_upcall = svc_export_upcall, 848 .cache_upcall = svc_export_upcall,
890 .cache_request = svc_export_request, 849 .cache_request = svc_export_request,
891 .cache_parse = svc_export_parse, 850 .cache_parse = svc_export_parse,
892 .cache_show = svc_export_show, 851 .cache_show = svc_export_show,
893 .match = svc_export_match, 852 .match = svc_export_match,
894 .init = svc_export_init, 853 .init = svc_export_init,
895 .update = export_update, 854 .update = export_update,
896 .alloc = svc_export_alloc, 855 .alloc = svc_export_alloc,
897 }; 856 };
898 857
899 static int 858 static int
900 svc_export_hash(struct svc_export *exp) 859 svc_export_hash(struct svc_export *exp)
901 { 860 {
902 int hash; 861 int hash;
903 862
904 hash = hash_ptr(exp->ex_client, EXPORT 863 hash = hash_ptr(exp->ex_client, EXPORT_HASHBITS);
905 hash ^= hash_ptr(exp->ex_path.dentry, 864 hash ^= hash_ptr(exp->ex_path.dentry, EXPORT_HASHBITS);
906 hash ^= hash_ptr(exp->ex_path.mnt, EXP 865 hash ^= hash_ptr(exp->ex_path.mnt, EXPORT_HASHBITS);
907 return hash; 866 return hash;
908 } 867 }
909 868
910 static struct svc_export * 869 static struct svc_export *
911 svc_export_lookup(struct svc_export *exp) 870 svc_export_lookup(struct svc_export *exp)
912 { 871 {
913 struct cache_head *ch; 872 struct cache_head *ch;
914 int hash = svc_export_hash(exp); 873 int hash = svc_export_hash(exp);
915 874
916 ch = sunrpc_cache_lookup_rcu(exp->cd, 875 ch = sunrpc_cache_lookup_rcu(exp->cd, &exp->h, hash);
917 if (ch) 876 if (ch)
918 return container_of(ch, struct 877 return container_of(ch, struct svc_export, h);
919 else 878 else
920 return NULL; 879 return NULL;
921 } 880 }
922 881
923 static struct svc_export * 882 static struct svc_export *
924 svc_export_update(struct svc_export *new, stru 883 svc_export_update(struct svc_export *new, struct svc_export *old)
925 { 884 {
926 struct cache_head *ch; 885 struct cache_head *ch;
927 int hash = svc_export_hash(old); 886 int hash = svc_export_hash(old);
928 887
929 ch = sunrpc_cache_update(old->cd, &new 888 ch = sunrpc_cache_update(old->cd, &new->h, &old->h, hash);
930 if (ch) 889 if (ch)
931 return container_of(ch, struct 890 return container_of(ch, struct svc_export, h);
932 else 891 else
933 return NULL; 892 return NULL;
934 } 893 }
935 894
936 895
937 static struct svc_expkey * 896 static struct svc_expkey *
938 exp_find_key(struct cache_detail *cd, struct a 897 exp_find_key(struct cache_detail *cd, struct auth_domain *clp, int fsid_type,
939 u32 *fsidv, struct cache_req *req 898 u32 *fsidv, struct cache_req *reqp)
940 { 899 {
941 struct svc_expkey key, *ek; 900 struct svc_expkey key, *ek;
942 int err; 901 int err;
943 902
944 if (!clp) 903 if (!clp)
945 return ERR_PTR(-ENOENT); 904 return ERR_PTR(-ENOENT);
946 905
947 key.ek_client = clp; 906 key.ek_client = clp;
948 key.ek_fsidtype = fsid_type; 907 key.ek_fsidtype = fsid_type;
949 memcpy(key.ek_fsid, fsidv, key_len(fsi 908 memcpy(key.ek_fsid, fsidv, key_len(fsid_type));
950 909
951 ek = svc_expkey_lookup(cd, &key); 910 ek = svc_expkey_lookup(cd, &key);
952 if (ek == NULL) 911 if (ek == NULL)
953 return ERR_PTR(-ENOMEM); 912 return ERR_PTR(-ENOMEM);
954 err = cache_check(cd, &ek->h, reqp); 913 err = cache_check(cd, &ek->h, reqp);
955 if (err) { 914 if (err) {
956 trace_nfsd_exp_find_key(&key, 915 trace_nfsd_exp_find_key(&key, err);
957 return ERR_PTR(err); 916 return ERR_PTR(err);
958 } 917 }
959 return ek; 918 return ek;
960 } 919 }
961 920
962 static struct svc_export * 921 static struct svc_export *
963 exp_get_by_name(struct cache_detail *cd, struc 922 exp_get_by_name(struct cache_detail *cd, struct auth_domain *clp,
964 const struct path *path, struc 923 const struct path *path, struct cache_req *reqp)
965 { 924 {
966 struct svc_export *exp, key; 925 struct svc_export *exp, key;
967 int err; 926 int err;
968 927
969 if (!clp) 928 if (!clp)
970 return ERR_PTR(-ENOENT); 929 return ERR_PTR(-ENOENT);
971 930
972 key.ex_client = clp; 931 key.ex_client = clp;
973 key.ex_path = *path; 932 key.ex_path = *path;
974 key.cd = cd; 933 key.cd = cd;
975 934
976 exp = svc_export_lookup(&key); 935 exp = svc_export_lookup(&key);
977 if (exp == NULL) 936 if (exp == NULL)
978 return ERR_PTR(-ENOMEM); 937 return ERR_PTR(-ENOMEM);
979 err = cache_check(cd, &exp->h, reqp); 938 err = cache_check(cd, &exp->h, reqp);
980 if (err) { 939 if (err) {
981 trace_nfsd_exp_get_by_name(&ke 940 trace_nfsd_exp_get_by_name(&key, err);
982 return ERR_PTR(err); 941 return ERR_PTR(err);
983 } 942 }
984 return exp; 943 return exp;
985 } 944 }
986 945
987 /* 946 /*
988 * Find the export entry for a given dentry. 947 * Find the export entry for a given dentry.
989 */ 948 */
990 static struct svc_export * 949 static struct svc_export *
991 exp_parent(struct cache_detail *cd, struct aut 950 exp_parent(struct cache_detail *cd, struct auth_domain *clp, struct path *path)
992 { 951 {
993 struct dentry *saved = dget(path->dent 952 struct dentry *saved = dget(path->dentry);
994 struct svc_export *exp = exp_get_by_na 953 struct svc_export *exp = exp_get_by_name(cd, clp, path, NULL);
995 954
996 while (PTR_ERR(exp) == -ENOENT && !IS_ 955 while (PTR_ERR(exp) == -ENOENT && !IS_ROOT(path->dentry)) {
997 struct dentry *parent = dget_p 956 struct dentry *parent = dget_parent(path->dentry);
998 dput(path->dentry); 957 dput(path->dentry);
999 path->dentry = parent; 958 path->dentry = parent;
1000 exp = exp_get_by_name(cd, clp 959 exp = exp_get_by_name(cd, clp, path, NULL);
1001 } 960 }
1002 dput(path->dentry); 961 dput(path->dentry);
1003 path->dentry = saved; 962 path->dentry = saved;
1004 return exp; 963 return exp;
1005 } 964 }
1006 965
1007 966
1008 967
1009 /* 968 /*
1010 * Obtain the root fh on behalf of a client. 969 * Obtain the root fh on behalf of a client.
1011 * This could be done in user space, but I fe 970 * 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 971 * since its harder to fool a kernel module than a user space program.
1013 */ 972 */
1014 int 973 int
1015 exp_rootfh(struct net *net, struct auth_domai 974 exp_rootfh(struct net *net, struct auth_domain *clp, char *name,
1016 struct knfsd_fh *f, int maxsize) 975 struct knfsd_fh *f, int maxsize)
1017 { 976 {
1018 struct svc_export *exp; 977 struct svc_export *exp;
1019 struct path path; 978 struct path path;
1020 struct inode *inode; 979 struct inode *inode;
1021 struct svc_fh fh; 980 struct svc_fh fh;
1022 int err; 981 int err;
1023 struct nfsd_net *nn = net_gen 982 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
1024 struct cache_detail *cd = nn->svc 983 struct cache_detail *cd = nn->svc_export_cache;
1025 984
1026 err = -EPERM; 985 err = -EPERM;
1027 /* NB: we probably ought to check tha 986 /* NB: we probably ought to check that it's NUL-terminated */
1028 if (kern_path(name, 0, &path)) { 987 if (kern_path(name, 0, &path)) {
1029 printk("nfsd: exp_rootfh path 988 printk("nfsd: exp_rootfh path not found %s", name);
1030 return err; 989 return err;
1031 } 990 }
1032 inode = d_inode(path.dentry); 991 inode = d_inode(path.dentry);
1033 992
1034 dprintk("nfsd: exp_rootfh(%s [%p] %s: 993 dprintk("nfsd: exp_rootfh(%s [%p] %s:%s/%ld)\n",
1035 name, path.dentry, clp->name 994 name, path.dentry, clp->name,
1036 inode->i_sb->s_id, inode->i_ 995 inode->i_sb->s_id, inode->i_ino);
1037 exp = exp_parent(cd, clp, &path); 996 exp = exp_parent(cd, clp, &path);
1038 if (IS_ERR(exp)) { 997 if (IS_ERR(exp)) {
1039 err = PTR_ERR(exp); 998 err = PTR_ERR(exp);
1040 goto out; 999 goto out;
1041 } 1000 }
1042 1001
1043 /* 1002 /*
1044 * fh must be initialized before call 1003 * fh must be initialized before calling fh_compose
1045 */ 1004 */
1046 fh_init(&fh, maxsize); 1005 fh_init(&fh, maxsize);
1047 if (fh_compose(&fh, exp, path.dentry, 1006 if (fh_compose(&fh, exp, path.dentry, NULL))
1048 err = -EINVAL; 1007 err = -EINVAL;
1049 else 1008 else
1050 err = 0; 1009 err = 0;
1051 memcpy(f, &fh.fh_handle, sizeof(struc 1010 memcpy(f, &fh.fh_handle, sizeof(struct knfsd_fh));
1052 fh_put(&fh); 1011 fh_put(&fh);
1053 exp_put(exp); 1012 exp_put(exp);
1054 out: 1013 out:
1055 path_put(&path); 1014 path_put(&path);
1056 return err; 1015 return err;
1057 } 1016 }
1058 1017
1059 static struct svc_export *exp_find(struct cac 1018 static struct svc_export *exp_find(struct cache_detail *cd,
1060 struct aut 1019 struct auth_domain *clp, int fsid_type,
1061 u32 *fsidv 1020 u32 *fsidv, struct cache_req *reqp)
1062 { 1021 {
1063 struct svc_export *exp; 1022 struct svc_export *exp;
1064 struct nfsd_net *nn = net_generic(cd- 1023 struct nfsd_net *nn = net_generic(cd->net, nfsd_net_id);
1065 struct svc_expkey *ek = exp_find_key( 1024 struct svc_expkey *ek = exp_find_key(nn->svc_expkey_cache, clp, fsid_type, fsidv, reqp);
1066 if (IS_ERR(ek)) 1025 if (IS_ERR(ek))
1067 return ERR_CAST(ek); 1026 return ERR_CAST(ek);
1068 1027
1069 exp = exp_get_by_name(cd, clp, &ek->e 1028 exp = exp_get_by_name(cd, clp, &ek->ek_path, reqp);
1070 cache_put(&ek->h, nn->svc_expkey_cach 1029 cache_put(&ek->h, nn->svc_expkey_cache);
1071 1030
1072 if (IS_ERR(exp)) 1031 if (IS_ERR(exp))
1073 return ERR_CAST(exp); 1032 return ERR_CAST(exp);
1074 return exp; 1033 return exp;
1075 } 1034 }
1076 1035
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 1036 __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp)
1087 { 1037 {
1088 struct exp_flavor_info *f, *end = exp !! 1038 struct exp_flavor_info *f;
1089 struct svc_xprt *xprt; !! 1039 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 1040
1118 ok: <<
1119 /* legacy gss-only clients are always 1041 /* legacy gss-only clients are always OK: */
1120 if (exp->ex_client == rqstp->rq_gsscl 1042 if (exp->ex_client == rqstp->rq_gssclient)
1121 return nfs_ok; !! 1043 return 0;
1122 /* ip-address based client; check sec 1044 /* ip-address based client; check sec= export option: */
1123 for (f = exp->ex_flavors; f < end; f+ 1045 for (f = exp->ex_flavors; f < end; f++) {
1124 if (f->pseudoflavor == rqstp- 1046 if (f->pseudoflavor == rqstp->rq_cred.cr_flavor)
1125 return nfs_ok; !! 1047 return 0;
1126 } 1048 }
1127 /* defaults in absence of sec= option 1049 /* defaults in absence of sec= options: */
1128 if (exp->ex_nflavors == 0) { 1050 if (exp->ex_nflavors == 0) {
1129 if (rqstp->rq_cred.cr_flavor 1051 if (rqstp->rq_cred.cr_flavor == RPC_AUTH_NULL ||
1130 rqstp->rq_cred.cr_flavor 1052 rqstp->rq_cred.cr_flavor == RPC_AUTH_UNIX)
1131 return nfs_ok; !! 1053 return 0;
1132 } 1054 }
1133 1055
1134 /* If the compound op contains a spo_ 1056 /* If the compound op contains a spo_must_allowed op,
1135 * it will be sent with integrity/pro 1057 * it will be sent with integrity/protection which
1136 * will have to be expressly allowed 1058 * will have to be expressly allowed on mounts that
1137 * don't support it 1059 * don't support it
1138 */ 1060 */
1139 1061
1140 if (nfsd4_spo_must_allow(rqstp)) 1062 if (nfsd4_spo_must_allow(rqstp))
1141 return nfs_ok; !! 1063 return 0;
1142 1064
1143 denied: !! 1065 return rqstp->rq_vers < 4 ? nfserr_acces : nfserr_wrongsec;
1144 return nfserr_wrongsec; <<
1145 } 1066 }
1146 1067
1147 /* 1068 /*
1148 * Uses rq_client and rq_gssclient to find an 1069 * Uses rq_client and rq_gssclient to find an export; uses rq_client (an
1149 * auth_unix client) if it's available and ha 1070 * auth_unix client) if it's available and has secinfo information;
1150 * otherwise, will try to use rq_gssclient. 1071 * otherwise, will try to use rq_gssclient.
1151 * 1072 *
1152 * Called from functions that handle requests 1073 * Called from functions that handle requests; functions that do work on
1153 * behalf of mountd are passed a single clien 1074 * behalf of mountd are passed a single client name to use, and should
1154 * use exp_get_by_name() or exp_find(). 1075 * use exp_get_by_name() or exp_find().
1155 */ 1076 */
1156 struct svc_export * 1077 struct svc_export *
1157 rqst_exp_get_by_name(struct svc_rqst *rqstp, 1078 rqst_exp_get_by_name(struct svc_rqst *rqstp, struct path *path)
1158 { 1079 {
1159 struct svc_export *gssexp, *exp = ERR 1080 struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);
1160 struct nfsd_net *nn = net_generic(SVC 1081 struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
1161 struct cache_detail *cd = nn->svc_exp 1082 struct cache_detail *cd = nn->svc_export_cache;
1162 1083
1163 if (rqstp->rq_client == NULL) 1084 if (rqstp->rq_client == NULL)
1164 goto gss; 1085 goto gss;
1165 1086
1166 /* First try the auth_unix client: */ 1087 /* First try the auth_unix client: */
1167 exp = exp_get_by_name(cd, rqstp->rq_c 1088 exp = exp_get_by_name(cd, rqstp->rq_client, path, &rqstp->rq_chandle);
1168 if (PTR_ERR(exp) == -ENOENT) 1089 if (PTR_ERR(exp) == -ENOENT)
1169 goto gss; 1090 goto gss;
1170 if (IS_ERR(exp)) 1091 if (IS_ERR(exp))
1171 return exp; 1092 return exp;
1172 /* If it has secinfo, assume there ar 1093 /* If it has secinfo, assume there are no gss/... clients */
1173 if (exp->ex_nflavors > 0) 1094 if (exp->ex_nflavors > 0)
1174 return exp; 1095 return exp;
1175 gss: 1096 gss:
1176 /* Otherwise, try falling back on gss 1097 /* Otherwise, try falling back on gss client */
1177 if (rqstp->rq_gssclient == NULL) 1098 if (rqstp->rq_gssclient == NULL)
1178 return exp; 1099 return exp;
1179 gssexp = exp_get_by_name(cd, rqstp->r 1100 gssexp = exp_get_by_name(cd, rqstp->rq_gssclient, path, &rqstp->rq_chandle);
1180 if (PTR_ERR(gssexp) == -ENOENT) 1101 if (PTR_ERR(gssexp) == -ENOENT)
1181 return exp; 1102 return exp;
1182 if (!IS_ERR(exp)) 1103 if (!IS_ERR(exp))
1183 exp_put(exp); 1104 exp_put(exp);
1184 return gssexp; 1105 return gssexp;
1185 } 1106 }
1186 1107
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 * 1108 struct svc_export *
1203 rqst_exp_find(struct cache_req *reqp, struct !! 1109 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 { 1110 {
1207 struct nfsd_net *nn = net_generic(net <<
1208 struct svc_export *gssexp, *exp = ERR 1111 struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);
>> 1112 struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
1209 struct cache_detail *cd = nn->svc_exp 1113 struct cache_detail *cd = nn->svc_export_cache;
1210 1114
1211 if (!cl) !! 1115 if (rqstp->rq_client == NULL)
1212 goto gss; 1116 goto gss;
1213 1117
1214 /* First try the auth_unix client: */ 1118 /* First try the auth_unix client: */
1215 exp = exp_find(cd, cl, fsid_type, fsi !! 1119 exp = exp_find(cd, rqstp->rq_client, fsid_type,
>> 1120 fsidv, &rqstp->rq_chandle);
1216 if (PTR_ERR(exp) == -ENOENT) 1121 if (PTR_ERR(exp) == -ENOENT)
1217 goto gss; 1122 goto gss;
1218 if (IS_ERR(exp)) 1123 if (IS_ERR(exp))
1219 return exp; 1124 return exp;
1220 /* If it has secinfo, assume there ar 1125 /* If it has secinfo, assume there are no gss/... clients */
1221 if (exp->ex_nflavors > 0) 1126 if (exp->ex_nflavors > 0)
1222 return exp; 1127 return exp;
1223 gss: 1128 gss:
1224 /* Otherwise, try falling back on gss 1129 /* Otherwise, try falling back on gss client */
1225 if (!gsscl) !! 1130 if (rqstp->rq_gssclient == NULL)
1226 return exp; 1131 return exp;
1227 gssexp = exp_find(cd, gsscl, fsid_typ !! 1132 gssexp = exp_find(cd, rqstp->rq_gssclient, fsid_type, fsidv,
>> 1133 &rqstp->rq_chandle);
1228 if (PTR_ERR(gssexp) == -ENOENT) 1134 if (PTR_ERR(gssexp) == -ENOENT)
1229 return exp; 1135 return exp;
1230 if (!IS_ERR(exp)) 1136 if (!IS_ERR(exp))
1231 exp_put(exp); 1137 exp_put(exp);
1232 return gssexp; 1138 return gssexp;
1233 } 1139 }
1234 1140
1235 struct svc_export * 1141 struct svc_export *
1236 rqst_exp_parent(struct svc_rqst *rqstp, struc 1142 rqst_exp_parent(struct svc_rqst *rqstp, struct path *path)
1237 { 1143 {
1238 struct dentry *saved = dget(path->den 1144 struct dentry *saved = dget(path->dentry);
1239 struct svc_export *exp = rqst_exp_get 1145 struct svc_export *exp = rqst_exp_get_by_name(rqstp, path);
1240 1146
1241 while (PTR_ERR(exp) == -ENOENT && !IS 1147 while (PTR_ERR(exp) == -ENOENT && !IS_ROOT(path->dentry)) {
1242 struct dentry *parent = dget_ 1148 struct dentry *parent = dget_parent(path->dentry);
1243 dput(path->dentry); 1149 dput(path->dentry);
1244 path->dentry = parent; 1150 path->dentry = parent;
1245 exp = rqst_exp_get_by_name(rq 1151 exp = rqst_exp_get_by_name(rqstp, path);
1246 } 1152 }
1247 dput(path->dentry); 1153 dput(path->dentry);
1248 path->dentry = saved; 1154 path->dentry = saved;
1249 return exp; 1155 return exp;
1250 } 1156 }
1251 1157
1252 struct svc_export *rqst_find_fsidzero_export( 1158 struct svc_export *rqst_find_fsidzero_export(struct svc_rqst *rqstp)
1253 { 1159 {
1254 u32 fsidv[2]; 1160 u32 fsidv[2];
1255 1161
1256 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NUL 1162 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);
1257 1163
1258 return rqst_exp_find(&rqstp->rq_chand !! 1164 return rqst_exp_find(rqstp, FSID_NUM, fsidv);
1259 rqstp->rq_client <<
1260 FSID_NUM, fsidv) <<
1261 } 1165 }
1262 1166
1263 /* 1167 /*
1264 * Called when we need the filehandle for the 1168 * Called when we need the filehandle for the root of the pseudofs,
1265 * for a given NFSv4 client. The root is de 1169 * for a given NFSv4 client. The root is defined to be the
1266 * export point with fsid==0 1170 * export point with fsid==0
1267 */ 1171 */
1268 __be32 1172 __be32
1269 exp_pseudoroot(struct svc_rqst *rqstp, struct 1173 exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)
1270 { 1174 {
1271 struct svc_export *exp; 1175 struct svc_export *exp;
1272 __be32 rv; 1176 __be32 rv;
1273 1177
1274 exp = rqst_find_fsidzero_export(rqstp 1178 exp = rqst_find_fsidzero_export(rqstp);
1275 if (IS_ERR(exp)) 1179 if (IS_ERR(exp))
1276 return nfserrno(PTR_ERR(exp)) 1180 return nfserrno(PTR_ERR(exp));
1277 rv = fh_compose(fhp, exp, exp->ex_pat 1181 rv = fh_compose(fhp, exp, exp->ex_path.dentry, NULL);
1278 exp_put(exp); 1182 exp_put(exp);
1279 return rv; 1183 return rv;
1280 } 1184 }
1281 1185
1282 static struct flags { 1186 static struct flags {
1283 int flag; 1187 int flag;
1284 char *name[2]; 1188 char *name[2];
1285 } expflags[] = { 1189 } expflags[] = {
1286 { NFSEXP_READONLY, {"ro", "rw"}}, 1190 { NFSEXP_READONLY, {"ro", "rw"}},
1287 { NFSEXP_INSECURE_PORT, {"insecure", 1191 { NFSEXP_INSECURE_PORT, {"insecure", ""}},
1288 { NFSEXP_ROOTSQUASH, {"root_squash", 1192 { NFSEXP_ROOTSQUASH, {"root_squash", "no_root_squash"}},
1289 { NFSEXP_ALLSQUASH, {"all_squash", "" 1193 { NFSEXP_ALLSQUASH, {"all_squash", ""}},
1290 { NFSEXP_ASYNC, {"async", "sync"}}, 1194 { NFSEXP_ASYNC, {"async", "sync"}},
1291 { NFSEXP_GATHERED_WRITES, {"wdelay", 1195 { NFSEXP_GATHERED_WRITES, {"wdelay", "no_wdelay"}},
1292 { NFSEXP_NOREADDIRPLUS, {"nordirplus" 1196 { NFSEXP_NOREADDIRPLUS, {"nordirplus", ""}},
1293 { NFSEXP_NOHIDE, {"nohide", ""}}, 1197 { NFSEXP_NOHIDE, {"nohide", ""}},
1294 { NFSEXP_CROSSMOUNT, {"crossmnt", ""} 1198 { NFSEXP_CROSSMOUNT, {"crossmnt", ""}},
1295 { NFSEXP_NOSUBTREECHECK, {"no_subtree 1199 { NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
1296 { NFSEXP_NOAUTHNLM, {"insecure_locks" 1200 { NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
1297 { NFSEXP_V4ROOT, {"v4root", ""}}, 1201 { NFSEXP_V4ROOT, {"v4root", ""}},
1298 { NFSEXP_PNFS, {"pnfs", ""}}, 1202 { NFSEXP_PNFS, {"pnfs", ""}},
1299 { NFSEXP_SECURITY_LABEL, {"security_l 1203 { NFSEXP_SECURITY_LABEL, {"security_label", ""}},
1300 { 0, {"", ""}} 1204 { 0, {"", ""}}
1301 }; 1205 };
1302 1206
1303 static void show_expflags(struct seq_file *m, 1207 static void show_expflags(struct seq_file *m, int flags, int mask)
1304 { 1208 {
1305 struct flags *flg; 1209 struct flags *flg;
1306 int state, first = 0; 1210 int state, first = 0;
1307 1211
1308 for (flg = expflags; flg->flag; flg++ 1212 for (flg = expflags; flg->flag; flg++) {
1309 if (flg->flag & ~mask) 1213 if (flg->flag & ~mask)
1310 continue; 1214 continue;
1311 state = (flg->flag & flags) ? 1215 state = (flg->flag & flags) ? 0 : 1;
1312 if (*flg->name[state]) 1216 if (*flg->name[state])
1313 seq_printf(m, "%s%s", 1217 seq_printf(m, "%s%s", first++?",":"", flg->name[state]);
1314 } 1218 }
1315 } 1219 }
1316 1220
1317 static void show_secinfo_flags(struct seq_fil 1221 static void show_secinfo_flags(struct seq_file *m, int flags)
1318 { 1222 {
1319 seq_printf(m, ","); 1223 seq_printf(m, ",");
1320 show_expflags(m, flags, NFSEXP_SECINF 1224 show_expflags(m, flags, NFSEXP_SECINFO_FLAGS);
1321 } 1225 }
1322 1226
1323 static bool secinfo_flags_equal(int f, int g) 1227 static bool secinfo_flags_equal(int f, int g)
1324 { 1228 {
1325 f &= NFSEXP_SECINFO_FLAGS; 1229 f &= NFSEXP_SECINFO_FLAGS;
1326 g &= NFSEXP_SECINFO_FLAGS; 1230 g &= NFSEXP_SECINFO_FLAGS;
1327 return f == g; 1231 return f == g;
1328 } 1232 }
1329 1233
1330 static int show_secinfo_run(struct seq_file * 1234 static int show_secinfo_run(struct seq_file *m, struct exp_flavor_info **fp, struct exp_flavor_info *end)
1331 { 1235 {
1332 int flags; 1236 int flags;
1333 1237
1334 flags = (*fp)->flags; 1238 flags = (*fp)->flags;
1335 seq_printf(m, ",sec=%d", (*fp)->pseud 1239 seq_printf(m, ",sec=%d", (*fp)->pseudoflavor);
1336 (*fp)++; 1240 (*fp)++;
1337 while (*fp != end && secinfo_flags_eq 1241 while (*fp != end && secinfo_flags_equal(flags, (*fp)->flags)) {
1338 seq_printf(m, ":%d", (*fp)->p 1242 seq_printf(m, ":%d", (*fp)->pseudoflavor);
1339 (*fp)++; 1243 (*fp)++;
1340 } 1244 }
1341 return flags; 1245 return flags;
1342 } 1246 }
1343 1247
1344 static void show_secinfo(struct seq_file *m, 1248 static void show_secinfo(struct seq_file *m, struct svc_export *exp)
1345 { 1249 {
1346 struct exp_flavor_info *f; 1250 struct exp_flavor_info *f;
1347 struct exp_flavor_info *end = exp->ex 1251 struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;
1348 int flags; 1252 int flags;
1349 1253
1350 if (exp->ex_nflavors == 0) 1254 if (exp->ex_nflavors == 0)
1351 return; 1255 return;
1352 f = exp->ex_flavors; 1256 f = exp->ex_flavors;
1353 flags = show_secinfo_run(m, &f, end); 1257 flags = show_secinfo_run(m, &f, end);
1354 if (!secinfo_flags_equal(flags, exp-> 1258 if (!secinfo_flags_equal(flags, exp->ex_flags))
1355 show_secinfo_flags(m, flags); 1259 show_secinfo_flags(m, flags);
1356 while (f != end) { 1260 while (f != end) {
1357 flags = show_secinfo_run(m, & 1261 flags = show_secinfo_run(m, &f, end);
1358 show_secinfo_flags(m, flags); 1262 show_secinfo_flags(m, flags);
1359 } 1263 }
1360 } 1264 }
1361 1265
1362 static void exp_flags(struct seq_file *m, int 1266 static void exp_flags(struct seq_file *m, int flag, int fsid,
1363 kuid_t anonu, kgid_t anong, s 1267 kuid_t anonu, kgid_t anong, struct nfsd4_fs_locations *fsloc)
1364 { 1268 {
1365 struct user_namespace *userns = m->fi 1269 struct user_namespace *userns = m->file->f_cred->user_ns;
1366 1270
1367 show_expflags(m, flag, NFSEXP_ALLFLAG 1271 show_expflags(m, flag, NFSEXP_ALLFLAGS);
1368 if (flag & NFSEXP_FSID) 1272 if (flag & NFSEXP_FSID)
1369 seq_printf(m, ",fsid=%d", fsi 1273 seq_printf(m, ",fsid=%d", fsid);
1370 if (!uid_eq(anonu, make_kuid(userns, 1274 if (!uid_eq(anonu, make_kuid(userns, (uid_t)-2)) &&
1371 !uid_eq(anonu, make_kuid(userns, 1275 !uid_eq(anonu, make_kuid(userns, 0x10000-2)))
1372 seq_printf(m, ",anonuid=%u", 1276 seq_printf(m, ",anonuid=%u", from_kuid_munged(userns, anonu));
1373 if (!gid_eq(anong, make_kgid(userns, 1277 if (!gid_eq(anong, make_kgid(userns, (gid_t)-2)) &&
1374 !gid_eq(anong, make_kgid(userns, 1278 !gid_eq(anong, make_kgid(userns, 0x10000-2)))
1375 seq_printf(m, ",anongid=%u", 1279 seq_printf(m, ",anongid=%u", from_kgid_munged(userns, anong));
1376 if (fsloc && fsloc->locations_count > 1280 if (fsloc && fsloc->locations_count > 0) {
1377 char *loctype = (fsloc->migra 1281 char *loctype = (fsloc->migrated) ? "refer" : "replicas";
1378 int i; 1282 int i;
1379 1283
1380 seq_printf(m, ",%s=", loctype 1284 seq_printf(m, ",%s=", loctype);
1381 seq_escape(m, fsloc->location 1285 seq_escape(m, fsloc->locations[0].path, ",;@ \t\n\\");
1382 seq_putc(m, '@'); 1286 seq_putc(m, '@');
1383 seq_escape(m, fsloc->location 1287 seq_escape(m, fsloc->locations[0].hosts, ",;@ \t\n\\");
1384 for (i = 1; i < fsloc->locati 1288 for (i = 1; i < fsloc->locations_count; i++) {
1385 seq_putc(m, ';'); 1289 seq_putc(m, ';');
1386 seq_escape(m, fsloc-> 1290 seq_escape(m, fsloc->locations[i].path, ",;@ \t\n\\");
1387 seq_putc(m, '@'); 1291 seq_putc(m, '@');
1388 seq_escape(m, fsloc-> 1292 seq_escape(m, fsloc->locations[i].hosts, ",;@ \t\n\\");
1389 } 1293 }
1390 } 1294 }
1391 } 1295 }
1392 1296
1393 static int e_show(struct seq_file *m, void *p 1297 static int e_show(struct seq_file *m, void *p)
1394 { 1298 {
1395 struct cache_head *cp = p; 1299 struct cache_head *cp = p;
1396 struct svc_export *exp = container_of 1300 struct svc_export *exp = container_of(cp, struct svc_export, h);
1397 struct cache_detail *cd = m->private; 1301 struct cache_detail *cd = m->private;
1398 bool export_stats = is_export_stats_f 1302 bool export_stats = is_export_stats_file(m);
1399 1303
1400 if (p == SEQ_START_TOKEN) { 1304 if (p == SEQ_START_TOKEN) {
1401 seq_puts(m, "# Version 1.1\n" 1305 seq_puts(m, "# Version 1.1\n");
1402 if (export_stats) 1306 if (export_stats)
1403 seq_puts(m, "# Path C 1307 seq_puts(m, "# Path Client Start-time\n#\tStats\n");
1404 else 1308 else
1405 seq_puts(m, "# Path C 1309 seq_puts(m, "# Path Client(Flags) # IPs\n");
1406 return 0; 1310 return 0;
1407 } 1311 }
1408 1312
1409 exp_get(exp); 1313 exp_get(exp);
1410 if (cache_check(cd, &exp->h, NULL)) 1314 if (cache_check(cd, &exp->h, NULL))
1411 return 0; 1315 return 0;
1412 exp_put(exp); 1316 exp_put(exp);
1413 return svc_export_show(m, cd, cp); 1317 return svc_export_show(m, cd, cp);
1414 } 1318 }
1415 1319
1416 const struct seq_operations nfs_exports_op = 1320 const struct seq_operations nfs_exports_op = {
1417 .start = cache_seq_start_rcu, 1321 .start = cache_seq_start_rcu,
1418 .next = cache_seq_next_rcu, 1322 .next = cache_seq_next_rcu,
1419 .stop = cache_seq_stop_rcu, 1323 .stop = cache_seq_stop_rcu,
1420 .show = e_show, 1324 .show = e_show,
1421 }; 1325 };
1422 1326
1423 /* 1327 /*
1424 * Initialize the exports module. 1328 * Initialize the exports module.
1425 */ 1329 */
1426 int 1330 int
1427 nfsd_export_init(struct net *net) 1331 nfsd_export_init(struct net *net)
1428 { 1332 {
1429 int rv; 1333 int rv;
1430 struct nfsd_net *nn = net_generic(net 1334 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
1431 1335
1432 dprintk("nfsd: initializing export mo 1336 dprintk("nfsd: initializing export module (net: %x).\n", net->ns.inum);
1433 1337
1434 nn->svc_export_cache = cache_create_n 1338 nn->svc_export_cache = cache_create_net(&svc_export_cache_template, net);
1435 if (IS_ERR(nn->svc_export_cache)) 1339 if (IS_ERR(nn->svc_export_cache))
1436 return PTR_ERR(nn->svc_export 1340 return PTR_ERR(nn->svc_export_cache);
1437 rv = cache_register_net(nn->svc_expor 1341 rv = cache_register_net(nn->svc_export_cache, net);
1438 if (rv) 1342 if (rv)
1439 goto destroy_export_cache; 1343 goto destroy_export_cache;
1440 1344
1441 nn->svc_expkey_cache = cache_create_n 1345 nn->svc_expkey_cache = cache_create_net(&svc_expkey_cache_template, net);
1442 if (IS_ERR(nn->svc_expkey_cache)) { 1346 if (IS_ERR(nn->svc_expkey_cache)) {
1443 rv = PTR_ERR(nn->svc_expkey_c 1347 rv = PTR_ERR(nn->svc_expkey_cache);
1444 goto unregister_export_cache; 1348 goto unregister_export_cache;
1445 } 1349 }
1446 rv = cache_register_net(nn->svc_expke 1350 rv = cache_register_net(nn->svc_expkey_cache, net);
1447 if (rv) 1351 if (rv)
1448 goto destroy_expkey_cache; 1352 goto destroy_expkey_cache;
1449 return 0; 1353 return 0;
1450 1354
1451 destroy_expkey_cache: 1355 destroy_expkey_cache:
1452 cache_destroy_net(nn->svc_expkey_cach 1356 cache_destroy_net(nn->svc_expkey_cache, net);
1453 unregister_export_cache: 1357 unregister_export_cache:
1454 cache_unregister_net(nn->svc_export_c 1358 cache_unregister_net(nn->svc_export_cache, net);
1455 destroy_export_cache: 1359 destroy_export_cache:
1456 cache_destroy_net(nn->svc_export_cach 1360 cache_destroy_net(nn->svc_export_cache, net);
1457 return rv; 1361 return rv;
1458 } 1362 }
1459 1363
1460 /* 1364 /*
1461 * Flush exports table - called when last nfs 1365 * Flush exports table - called when last nfsd thread is killed
1462 */ 1366 */
1463 void 1367 void
1464 nfsd_export_flush(struct net *net) 1368 nfsd_export_flush(struct net *net)
1465 { 1369 {
1466 struct nfsd_net *nn = net_generic(net 1370 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
1467 1371
1468 cache_purge(nn->svc_expkey_cache); 1372 cache_purge(nn->svc_expkey_cache);
1469 cache_purge(nn->svc_export_cache); 1373 cache_purge(nn->svc_export_cache);
1470 } 1374 }
1471 1375
1472 /* 1376 /*
1473 * Shutdown the exports module. 1377 * Shutdown the exports module.
1474 */ 1378 */
1475 void 1379 void
1476 nfsd_export_shutdown(struct net *net) 1380 nfsd_export_shutdown(struct net *net)
1477 { 1381 {
1478 struct nfsd_net *nn = net_generic(net 1382 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
1479 1383
1480 dprintk("nfsd: shutting down export m 1384 dprintk("nfsd: shutting down export module (net: %x).\n", net->ns.inum);
1481 1385
1482 cache_unregister_net(nn->svc_expkey_c 1386 cache_unregister_net(nn->svc_expkey_cache, net);
1483 cache_unregister_net(nn->svc_export_c 1387 cache_unregister_net(nn->svc_export_cache, net);
1484 cache_destroy_net(nn->svc_expkey_cach 1388 cache_destroy_net(nn->svc_expkey_cache, net);
1485 cache_destroy_net(nn->svc_export_cach 1389 cache_destroy_net(nn->svc_export_cache, net);
1486 svcauth_unix_purge(net); 1390 svcauth_unix_purge(net);
1487 1391
1488 dprintk("nfsd: export shutdown comple 1392 dprintk("nfsd: export shutdown complete (net: %x).\n", net->ns.inum);
1489 } 1393 }
1490 1394
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.