NFSD: Using type of uint32_t for ex_nflavors instead of int
Subsystems (2)
PATCH 1/1 NFSD: Using type of uint32_t for ex_nflavors instead of int
ex_nflavors can't be negative number, just defined by uint32_t.
Signed-off-by Kinglong Mee <[email protected]>
--- fs/nfsd/export.c | 7 ++++--- fs/nfsd/export.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
fs/nfsd/export.c +4 -3
@@ -437,13 +437,14 @@ out_free_all:static int secinfo_parse (char **mesg,char *buf,struct svc_export *exp) { -int listsize, err;struct exp_flavor_info *f; +u32 listsize; +int err; - err =get_int (mesg, &listsize); + err =get_uint (mesg, &listsize);if (err)return err; -if (listsize <0 || listsize >MAX_SECINFO_LIST ) +if (listsize >MAX_SECINFO_LIST )return -EINVAL ;for (f = exp->ex_flavors; f < exp->ex_flavors + listsize; f++) {
fs/nfsd/export.h +1 -1
@@ -53,7 +53,7 @@ struct svc_export {int ex_fsid;unsigned char * ex_uuid;/* 16 byte fsid */ struct nfsd4_fs_locations ex_fslocs; -int ex_nflavors; +uint32_t ex_nflavors;struct exp_flavor_info ex_flavors[MAX_SECINFO_LIST ];struct cache_detail *cd; };
Signature · 1 line
1.9.3
Quoted 1 line · Kinglong Mee
ex_nflavorscan't be negative number, just defined byuint32_t.
OK, applying for 3.16.--b.
Quoted 45 lines
Signed-off-by Kinglong Mee <[email protected]>--- fs/nfsd/export.c | 7 ++++--- fs/nfsd/export.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)fs/nfsd/export.c +4
-3@@ -437,13 +437,14 @@ out_free_all:static int secinfo_parse (char **mesg,char *buf,struct svc_export *exp) { -int listsize, err;struct exp_flavor_info *f; +u32 listsize; +int err; - err =get_int (mesg, &listsize); + err =get_uint (mesg, &listsize);if (err)return err; -if (listsize <0 || listsize >MAX_SECINFO_LIST ) +if (listsize >MAX_SECINFO_LIST )return -EINVAL ;for (f = exp->ex_flavors; f < exp->ex_flavors + listsize; f++) {fs/nfsd/export.h +1
-1@@ -53,7 +53,7 @@ struct svc_export {int ex_fsid;unsigned char * ex_uuid;/* 16 byte fsid */ struct nfsd4_fs_locations ex_fslocs; -int ex_nflavors; +uint32_t ex_nflavors;struct exp_flavor_info ex_flavors[MAX_SECINFO_LIST ];struct cache_detail *cd; };Signature · 1 line
1.9.3