summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorPrashanth Pai <ppai@redhat.com>2015-05-12 16:36:55 +0530
committerNiels de Vos <ndevos@redhat.com>2015-08-26 09:17:19 -0700
commit6c4096f5e6a6d0f2b21cb4b2bea098b6f4eebbed (patch)
tree6fa6706c3aa5f25e312af30f73fabcce1e4efa20 /api
parent7f346e567edb94b008a5f0fa9f614fa8a296636b (diff)
libgfapi: Gracefully exit when glfd is invalid
This is a backport of: http://review.gluster.org/10759 When glfs_* methods operating on glfd are invoked after calling glfs_close(), the program segfaults inside __GLFS_ENTRY_VALIDATE_FD trying to deference glfd->fd->inode which is invalid. Also, returning EBADF seemed more specific than EINVAL. BUG: 1240920 Change-Id: I13a92dca52da9a300252b69e026581b3a9e931fd Signed-off-by: Prashanth Pai <ppai@redhat.com> Reviewed-on-master: http://review.gluster.org/10759 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> Reviewed-on: http://review.gluster.org/11571 Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com> Reviewed-by: bipin kunal <bkunal@redhat.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'api')
-rw-r--r--api/src/glfs-internal.h4
-rw-r--r--api/src/glfs.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
index 5696a5b..1c308df 100644
--- a/api/src/glfs-internal.h
+++ b/api/src/glfs-internal.h
@@ -267,8 +267,8 @@ do { \
#define __GLFS_ENTRY_VALIDATE_FD(glfd, label) \
do { \
- if (!glfd) { \
- errno = EINVAL; \
+ if (!glfd || !glfd->fd || !glfd->fd->inode) { \
+ errno = EBADF; \
goto label; \
} \
old_THIS = THIS; \
diff --git a/api/src/glfs.c b/api/src/glfs.c
index 5653f4d..b3a3f97 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -560,8 +560,10 @@ glfs_fd_destroy (struct glfs_fd *glfd)
}
glfs_unlock (glfd->fs);
- if (glfd->fd)
- fd_unref (glfd->fd);
+ if (glfd->fd) {
+ fd_unref (glfd->fd);
+ glfd->fd = NULL;
+ }
GF_FREE (glfd->readdirbuf);