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

advlock: simplify overflow checks

Browse Source
This commit is contained in:
Andrey A. Chernov 2001-08-29 18:53:53 +00:00
parent 63347f1e8f
commit c8e7634357
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=82516
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/kern_descrip.c
View File

@ -307,10 +307,9 @@ fcntl(p, uap)
return (error);
}
if (fl.l_whence == SEEK_CUR) {
if ((fl.l_start > 0 &&
fp->f_offset > OFF_MAX - fl.l_start) ||
(fl.l_start < 0 &&
fp->f_offset < OFF_MIN - fl.l_start)) {
if (fp->f_offset < 0 ||
(fl.l_start > 0 &&
fp->f_offset > OFF_MAX - fl.l_start)) {
fdrop(fp, p);
return (EOVERFLOW);
}

4
sys/kern/kern_lockf.c
View File

@ -121,8 +121,8 @@ lf_advlock(ap, head, size)
break;
case SEEK_END:
if ((fl->l_start > 0 && size > OFF_MAX - fl->l_start) ||
(fl->l_start < 0 && size + fl->l_start > OFF_MAX))
if (size > OFF_MAX ||
(fl->l_start > 0 && size > OFF_MAX - fl->l_start))
return (EOVERFLOW);
start = size + fl->l_start;
break;