evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: minor off by one checks in __write_versions()

Browse source 
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>
Reviewed-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Dan Carpenter 2014-11-27 18:58:54 +03:00 • committed by J. Bruce Fields
parent 067f96ef17
commit 818f2f57f2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/nfsd/nfsctl.c
View file

@ -606,7 +606,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size)
num); num);
sep = " "; sep = " ";
if (len > remaining) if (len >= remaining)
break; break;
remaining -= len; remaining -= len;
buf += len; buf += len;
@ -621,7 +621,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size)
'+' : '-', '+' : '-',
minor); minor);
if (len > remaining) if (len >= remaining)
break; break;
remaining -= len; remaining -= len;
buf += len; buf += len;
@ -629,7 +629,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size)
} }
len = snprintf(buf, remaining, "\n"); len = snprintf(buf, remaining, "\n");
if (len > remaining) if (len >= remaining)
return -EINVAL; return -EINVAL;
return tlen + len; return tlen + len;
} }