From 1ce54da9679c53d9e7af787a255ec0ad11aa1ac0 Mon Sep 17 00:00:00 2001 From: Santosh Kumar Pradhan Date: Sun, 13 Oct 2013 20:42:57 +0530 Subject: nfs/mount3: fix crash in subdir resolution * __mnt3_resolve_export_subdir_comp: if nfs_entry_loc_fill fails, mres->resolveloc does not contain valid data * gf_log should use 'gfid' instead of mres->resolveloc.inode->gfid * fixes a crash if program flow gets to this line Backport FIX link: http://review.gluster.org/4948 Signed-off-by: Santosh Kumar Pradhan Change-Id: I6dea17ae3f07210430a0b71bd08be6f59f739c9a BUG: 1018547 Signed-off-by: Santosh Kumar Pradhan Reviewed-on: http://review.gluster.org/6083 Tested-by: Gluster Build System Reviewed-by: Rajesh Joseph --- xlators/nfs/server/src/mount3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/nfs/server/src/mount3.c') diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 255310fa800..932dccdc478 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -526,7 +526,7 @@ __mnt3_resolve_export_subdir_comp (mnt3_resolve_t *mres) if ((ret < 0) && (ret != -2)) { gf_log (GF_MNT, GF_LOG_ERROR, "Failed to resolve and create " "inode: parent gfid %s, entry %s", - uuid_utoa (mres->resolveloc.inode->gfid), nextcomp); + uuid_utoa (gfid), nextcomp); ret = -EFAULT; goto err; } -- cgit