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 /tests/basic | |
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 'tests/basic')
-rw-r--r-- | tests/basic/gfapi/bug-1241104.c | 91 | ||||
-rwxr-xr-x | tests/basic/gfapi/bug-1241104.sh | 30 |
2 files changed, 121 insertions, 0 deletions
diff --git a/tests/basic/gfapi/bug-1241104.c b/tests/basic/gfapi/bug-1241104.c new file mode 100644 index 00000000000..0f1a616bd39 --- /dev/null +++ b/tests/basic/gfapi/bug-1241104.c @@ -0,0 +1,91 @@ +#include <fcntl.h> +#include <unistd.h> +#include <time.h> +#include <limits.h> +#include <alloca.h> +#include <string.h> +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <glusterfs/api/glfs.h> +#include <glusterfs/api/glfs-handles.h> +#include <sys/wait.h> + +int gfapi = 1; + +#define LOG_ERR(func, ret) do { \ + if (ret != 0) { \ + fprintf (stderr, "%s : returned error %d (%s)\n", \ + func, ret, strerror (errno)); \ + goto out; \ + } else { \ + fprintf (stderr, "%s : returned %d\n", func, ret); \ + } \ + } while (0) + +int +main (int argc, char *argv[]) +{ + glfs_t *fs = NULL; + int ret = 0, i, status = 0; + glfs_fd_t *fd = NULL; + char *filename = "file_tmp"; + char *volname = NULL; + char *logfile = NULL; + struct flock lock = {0, }; + + if (argc != 3) { + fprintf (stderr, "Invalid argument\n"); + exit(1); + } + + volname = argv[1]; + logfile = argv[2]; + + fs = glfs_new (volname); + if (!fs) { + fprintf (stderr, "glfs_new: returned NULL\n"); + return -1; + } + + ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007); + LOG_ERR("glfs_set_volfile_server", ret); + + ret = glfs_set_logging (fs, logfile, 7); + LOG_ERR("glfs_set_logging", ret); + + ret = glfs_init (fs); + LOG_ERR("glfs_init", ret); + + fd = glfs_creat(fs, filename, O_RDWR|O_SYNC, 0644); + if (fd <= 0) { + ret = -1; + LOG_ERR ("glfs_creat", ret); + } + fprintf (stderr, "glfs-create fd - %d\n", fd); + + /* validate locks for negative range */ + lock.l_type = F_WRLCK; + lock.l_whence = SEEK_SET; + lock.l_start = 10; + lock.l_len = -9; + + ret = glfs_posix_lock (fd, F_SETLK, &lock); + LOG_ERR ("glfs_posix_lock", ret); + +err: + glfs_close(fd); + LOG_ERR ("glfs_close", ret); + +out: + if (fs) { + ret = glfs_fini(fs); + fprintf (stderr, "glfs_fini(fs) returned %d \n", ret); + } + + if (ret) + exit(1); + exit(0); +} + + diff --git a/tests/basic/gfapi/bug-1241104.sh b/tests/basic/gfapi/bug-1241104.sh new file mode 100755 index 00000000000..e071835758d --- /dev/null +++ b/tests/basic/gfapi/bug-1241104.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc + +cleanup; + +TEST glusterd + +TEST $CLI volume create $V0 localhost:$B0/brick1; +EXPECT 'Created' volinfo_field $V0 'Status'; + +TEST $CLI volume start $V0; +EXPECT 'Started' volinfo_field $V0 'Status'; + +logdir=`gluster --print-logdir` + +## Enable Upcall cache-invalidation feature +TEST $CLI volume set $V0 features.cache-invalidation on; + +build_tester $(dirname $0)/bug-1241104.c -lgfapi -o $(dirname $0)/bug-1241104 + +TEST ./$(dirname $0)/bug-1241104 $V0 $logdir/bug-1241104.log + +cleanup_tester $(dirname $0)/bug1241104 + +TEST $CLI volume stop $V0 +TEST $CLI volume delete $V0 + +cleanup; |