d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement l_len<0 per POSIX check.

Browse Source 
Check for valid l_whence too.
This commit is contained in:
Andrey A. Chernov 2001-08-23 16:13:59 +00:00
parent ea4313e351
commit e02faad5ca
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/nfs/nfs_lock.c
View File

@ -102,12 +102,14 @@ nfs_dolock(ap)
* the NLM protocol doesn't allow the server to return an error
* on ranges, so we do it.
*/
if (fl->l_len < 0)
return (EINVAL);
if (fl->l_whence != SEEK_END) {
if (fl->l_start < 0)
if (fl->l_whence != SEEK_CUR || fl->l_whence != SEEK_SET ||
fl->l_start < 0 ||
(fl->l_len < 0 &&
(fl->l_start == 0 || fl->l_start + fl->l_len < 0)))
return (EINVAL);
if (fl->l_len != 0 && (fl->l_len - 1 > OFF_MAX - fl->l_start))
if (fl->l_len > 0 &&
(fl->l_len - 1 > OFF_MAX - fl->l_start))
return (EOVERFLOW);
}

10
sys/nfsclient/nfs_lock.c
View File

@ -102,12 +102,14 @@ nfs_dolock(ap)
* the NLM protocol doesn't allow the server to return an error
* on ranges, so we do it.
*/
if (fl->l_len < 0)
return (EINVAL);
if (fl->l_whence != SEEK_END) {
if (fl->l_start < 0)
if (fl->l_whence != SEEK_CUR || fl->l_whence != SEEK_SET ||
fl->l_start < 0 ||
(fl->l_len < 0 &&
(fl->l_start == 0 || fl->l_start + fl->l_len < 0)))
return (EINVAL);
if (fl->l_len != 0 && (fl->l_len - 1 > OFF_MAX - fl->l_start))
if (fl->l_len > 0 &&
(fl->l_len - 1 > OFF_MAX - fl->l_start))
return (EOVERFLOW);
}