summaryrefslogtreecommitdiffstats
path: root/sys/nfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/nfs')
-rw-r--r--sys/nfs/nfs_lock.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/nfs/nfs_lock.c b/sys/nfs/nfs_lock.c
index ac52410..607662c 100644
--- a/sys/nfs/nfs_lock.c
+++ b/sys/nfs/nfs_lock.c
@@ -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);
}
OpenPOWER on IntegriCloud