Commit 0a725fc4 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds

nfsd4: idmap upcalls should use unsigned uid and gid

We shouldn't be using negative uid's and gid's in the idmap upcalls.
Signed-off-by: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 749997e5
...@@ -138,7 +138,7 @@ idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp, ...@@ -138,7 +138,7 @@ idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
char idstr[11]; char idstr[11];
qword_add(bpp, blen, ent->authname); qword_add(bpp, blen, ent->authname);
snprintf(idstr, sizeof(idstr), "%d", ent->id); snprintf(idstr, sizeof(idstr), "%u", ent->id);
qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user"); qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user");
qword_add(bpp, blen, idstr); qword_add(bpp, blen, idstr);
...@@ -165,7 +165,7 @@ idtoname_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h) ...@@ -165,7 +165,7 @@ idtoname_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
return 0; return 0;
} }
ent = container_of(h, struct ent, h); ent = container_of(h, struct ent, h);
seq_printf(m, "%s %s %d", ent->authname, seq_printf(m, "%s %s %u", ent->authname,
ent->type == IDMAP_TYPE_GROUP ? "group" : "user", ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
ent->id); ent->id);
if (test_bit(CACHE_VALID, &h->flags)) if (test_bit(CACHE_VALID, &h->flags))
...@@ -349,7 +349,7 @@ nametoid_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h) ...@@ -349,7 +349,7 @@ nametoid_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
ent->type == IDMAP_TYPE_GROUP ? "group" : "user", ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
ent->name); ent->name);
if (test_bit(CACHE_VALID, &h->flags)) if (test_bit(CACHE_VALID, &h->flags))
seq_printf(m, " %d", ent->id); seq_printf(m, " %u", ent->id);
seq_printf(m, "\n"); seq_printf(m, "\n");
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment