| Message ID | 20141127155854.GB21914@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 27 Nov 2014 18:58:54 +0300 Dan Carpenter <dan.carpenter@oracle.com> wrote: > My static checker complains that if "len == remaining" then it means we > have truncated the last character off the version string. > > The intent of the code is that we print as many versions as we can > without truncating a version. Then we put a newline at the end. If the > newline can't fit we return -EINVAL. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > index 9506ea5..19ace74 100644 > --- a/fs/nfsd/nfsctl.c > +++ b/fs/nfsd/nfsctl.c > @@ -608,7 +608,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) > num); > sep = " "; > > - if (len > remaining) > + if (len >= remaining) > break; > remaining -= len; > buf += len; > @@ -623,7 +623,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) > '+' : '-', > minor); > > - if (len > remaining) > + if (len >= remaining) > break; > remaining -= len; > buf += len; > @@ -631,7 +631,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) > } > > len = snprintf(buf, remaining, "\n"); > - if (len > remaining) > + if (len >= remaining) > return -EINVAL; > return tlen + len; > } > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Looks correct. Good catch. Reviewed-by: Jeff Layton <jlayton@primarydata.com> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 9506ea5..19ace74 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -608,7 +608,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) num); sep = " "; - if (len > remaining) + if (len >= remaining) break; remaining -= len; buf += len; @@ -623,7 +623,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) '+' : '-', minor); - if (len > remaining) + if (len >= remaining) break; remaining -= len; buf += len; @@ -631,7 +631,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) } len = snprintf(buf, remaining, "\n"); - if (len > remaining) + if (len >= remaining) return -EINVAL; return tlen + len; }
My static checker complains that if "len == remaining" then it means we have truncated the last character off the version string. The intent of the code is that we print as many versions as we can without truncating a version. Then we put a newline at the end. If the newline can't fit we return -EINVAL. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html