diff options
| author | Soumya Koduri <skoduri@redhat.com> | 2015-07-10 12:40:24 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2016-02-25 01:34:56 -0800 |
| commit | e410c3a0c97a7bfe109badba5b6a5dd094016995 (patch) | |
| tree | a1d691865fc39bb11ecccd8d81327e9542f78dac /xlators/features/locks/src | |
| parent | 5bfd22123753fb88c1a2ea91ffd4f6767d89f278 (diff) | |
locks: Handle negative values for flock->l_len
As per 'man 3 fcntl',
"If l_len is positive, the area affected shall start at
l_start and end at l_start+l_len−1. If l_len is negative,
the area affected shall start at l_start+l_len and end at
l_start−1. Locks may start and extend beyond the current
end of a file, but shall not extend before the beginning
of the file."
Currently we return EINVAL if l_len is found to be negative.
Fixed the same as mentioned in the man page.
Change-Id: I493ce202c543185fc4ae7266d1aaf9d7e2a66991
BUG: 1241104
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-on: http://review.gluster.org/11613
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/features/locks/src')
| -rw-r--r-- | xlators/features/locks/src/posix.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index 8d1e67e703c..dae881d4f20 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -1806,12 +1806,23 @@ pl_lk (call_frame_t *frame, xlator_t *this, posix_lock_t *conf = NULL; int ret = 0; - if ((flock->l_start < 0) || (flock->l_len < 0)) { + if ((flock->l_start < 0) || + ((flock->l_start + flock->l_len) < 0)) { op_ret = -1; op_errno = EINVAL; goto unwind; } + /* As per 'man 3 fcntl', the value of l_len may be + * negative. In such cases, lock request should be + * considered for the range starting at 'l_start+l_len' + * and ending at 'l_start-1'. Update the fields accordingly. + */ + if (flock->l_len < 0) { + flock->l_start += flock->l_len; + flock->l_len = abs (flock->l_len); + } + pl_inode = pl_inode_get (this, fd->inode); if (!pl_inode) { op_ret = -1; |