diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2001-08-23 08:20:21 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2001-08-23 08:20:21 +0000 |
| commit | e9d095afdc26cc31afa7ed3b3f138d3719636091 (patch) | |
| tree | 42813e99aa0cc29b800224ccb7de2239bee5244f /sys | |
| parent | 69cc1d0d7f3445d3671e05dcb7baabe7e36c5ed9 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/nfs/nfs_lock.c | 10 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_lock.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/nfs/nfs_lock.c b/sys/nfs/nfs_lock.c index 9e28eeb8a6005..94b5df1c999af 100644 --- a/sys/nfs/nfs_lock.c +++ b/sys/nfs/nfs_lock.c @@ -29,6 +29,7 @@ * $FreeBSD$ */ +#include <machine/limits.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> @@ -98,13 +99,12 @@ nfs_dolock(ap) /* * the NLM protocol doesn't allow the server to return an error - * on ranges, so we do it. Note that we should be returning - * EOVERFLOW in some cases, but we don't have it. + * on ranges, so we do it. */ - if (fl->l_start < 0 || fl->l_len < 0 || - ((fl->l_len != 0 && - (fl->l_start + fl->l_len - 1) < 0))) + if (fl->l_start < 0 || fl->l_len < 0) return (EINVAL); + if (fl->l_len != 0 && (fl->l_len - 1 > OFF_MAX - fl->l_start)) + return (EOVERFLOW); /* * Fill in the information structure. diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c index 9e28eeb8a6005..94b5df1c999af 100644 --- a/sys/nfsclient/nfs_lock.c +++ b/sys/nfsclient/nfs_lock.c @@ -29,6 +29,7 @@ * $FreeBSD$ */ +#include <machine/limits.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> @@ -98,13 +99,12 @@ nfs_dolock(ap) /* * the NLM protocol doesn't allow the server to return an error - * on ranges, so we do it. Note that we should be returning - * EOVERFLOW in some cases, but we don't have it. + * on ranges, so we do it. */ - if (fl->l_start < 0 || fl->l_len < 0 || - ((fl->l_len != 0 && - (fl->l_start + fl->l_len - 1) < 0))) + if (fl->l_start < 0 || fl->l_len < 0) return (EINVAL); + if (fl->l_len != 0 && (fl->l_len - 1 > OFF_MAX - fl->l_start)) + return (EOVERFLOW); /* * Fill in the information structure. |