Skip to content

Commit

Permalink
nfsd: add get_uint for u32's
Browse files Browse the repository at this point in the history
I don't think there's a practical difference for the range of values
these interfaces should see, but it would be safer to be unambiguous.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
J. Bruce Fields committed Jul 25, 2012
1 parent a6d88f2 commit a007c4c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/nfsd/export.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ fsloc_parse(char **mesg, char *buf, struct nfsd4_fs_locations *fsloc)
int migrated, i, err;

/* listsize */
err = get_int(mesg, &fsloc->locations_count);
err = get_uint(mesg, &fsloc->locations_count);
if (err)
return err;
if (fsloc->locations_count > MAX_FS_LOCATIONS)
Expand Down Expand Up @@ -456,7 +456,7 @@ static int secinfo_parse(char **mesg, char *buf, struct svc_export *exp)
return -EINVAL;

for (f = exp->ex_flavors; f < exp->ex_flavors + listsize; f++) {
err = get_int(mesg, &f->pseudoflavor);
err = get_uint(mesg, &f->pseudoflavor);
if (err)
return err;
/*
Expand All @@ -465,7 +465,7 @@ static int secinfo_parse(char **mesg, char *buf, struct svc_export *exp)
* problem at export time instead of when a client fails
* to authenticate.
*/
err = get_int(mesg, &f->flags);
err = get_uint(mesg, &f->flags);
if (err)
return err;
/* Only some flags are allowed to differ between flavors: */
Expand Down
16 changes: 16 additions & 0 deletions include/linux/sunrpc/cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,22 @@ static inline int get_int(char **bpp, int *anint)
return 0;
}

static inline int get_uint(char **bpp, unsigned int *anint)
{
char buf[50];
int len = qword_get(bpp, buf, sizeof(buf));

if (len < 0)
return -EINVAL;
if (len == 0)
return -ENOENT;

if (kstrtouint(buf, 0, anint))
return -EINVAL;

return 0;
}

/*
* timestamps kept in the cache are expressed in seconds
* since boot. This is the best for measuring differences in
Expand Down

0 comments on commit a007c4c

Please sign in to comment.