projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nfsd
/
export.c
diff --git
a/fs/nfsd/export.c
b/fs/nfsd/export.c
index b9566e46219f3ac8af1e9ab6916aadece4a02177..d7c4f02673d242b355a911f7d867f7c7256ed7b6 100644
(file)
--- a/
fs/nfsd/export.c
+++ b/
fs/nfsd/export.c
@@
-88,7
+88,7
@@
static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
struct svc_expkey key;
struct svc_expkey *ek = NULL;
struct svc_expkey key;
struct svc_expkey *ek = NULL;
- if (mesg[mlen-1] != '\n')
+ if (m
len < 1 || m
esg[mlen-1] != '\n')
return -EINVAL;
mesg[mlen-1] = 0;
return -EINVAL;
mesg[mlen-1] = 0;
@@
-403,7
+403,7
@@
fsloc_parse(char **mesg, char *buf, struct nfsd4_fs_locations *fsloc)
int migrated, i, err;
/* listsize */
int migrated, i, err;
/* listsize */
- err = get_int(mesg, &fsloc->locations_count);
+ err = get_
u
int(mesg, &fsloc->locations_count);
if (err)
return err;
if (fsloc->locations_count > MAX_FS_LOCATIONS)
if (err)
return err;
if (fsloc->locations_count > MAX_FS_LOCATIONS)
@@
-461,7
+461,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++) {
return -EINVAL;
for (f = exp->ex_flavors; f < exp->ex_flavors + listsize; f++) {
- err = get_int(mesg, &f->pseudoflavor);
+ err = get_
u
int(mesg, &f->pseudoflavor);
if (err)
return err;
/*
if (err)
return err;
/*
@@
-470,7
+470,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.
*/
* problem at export time instead of when a client fails
* to authenticate.
*/
- err = get_int(mesg, &f->flags);
+ err = get_
u
int(mesg, &f->flags);
if (err)
return err;
/* Only some flags are allowed to differ between flavors: */
if (err)
return err;
/* Only some flags are allowed to differ between flavors: */