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

adv. lock:

Browse Source 
detect off_t overflow _before_ it occurse and return EOVERFLOW instead of
EINVAL
This commit is contained in:
Andrey A. Chernov 2001-08-23 08:20:21 +00:00
parent 69cc1d0d7f
commit e9d095afdc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/nfs/nfs_lock.c
View File

@ -29,6 +29,7 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#include <machine/limits.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
@ -98,13 +99,12 @@ nfs_dolock(ap)
/* /*
* the NLM protocol doesn't allow the server to return an error * the NLM protocol doesn't allow the server to return an error
* on ranges, so we do it. Note that we should be returning * on ranges, so we do it.
* EOVERFLOW in some cases, but we don't have it.
*/ */
if (fl->l_start < 0 || fl->l_len < 0 || if (fl->l_start < 0 || fl->l_len < 0)
((fl->l_len != 0 &&
(fl->l_start + fl->l_len - 1) < 0)))
return (EINVAL); return (EINVAL);
if (fl->l_len != 0 && (fl->l_len - 1 > OFF_MAX - fl->l_start))
return (EOVERFLOW);
/* /*
* Fill in the information structure. * Fill in the information structure.

10
sys/nfsclient/nfs_lock.c
View File

@ -29,6 +29,7 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#include <machine/limits.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
@ -98,13 +99,12 @@ nfs_dolock(ap)
/* /*
* the NLM protocol doesn't allow the server to return an error * the NLM protocol doesn't allow the server to return an error
* on ranges, so we do it. Note that we should be returning * on ranges, so we do it.
* EOVERFLOW in some cases, but we don't have it.
*/ */
if (fl->l_start < 0 || fl->l_len < 0 || if (fl->l_start < 0 || fl->l_len < 0)
((fl->l_len != 0 &&
(fl->l_start + fl->l_len - 1) < 0)))
return (EINVAL); return (EINVAL);
if (fl->l_len != 0 && (fl->l_len - 1 > OFF_MAX - fl->l_start))
return (EOVERFLOW);
/* /*
* Fill in the information structure. * Fill in the information structure.