diff options
| author | Michael Brown <michael@netdirect.ca> | 2013-05-03 14:32:23 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-06-19 00:16:22 -0700 |
| commit | bb1d5e826f6c64092a03bf292e72fb314e2b4a2d (patch) | |
| tree | bf773745ad570e0bb60a0a9ef3449693215a9843 /xlators/nfs/server/src/mount3.c | |
| parent | 1d6f6a65d76f0e8dc9b62fdae305b6246ce268c5 (diff) | |
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
Change-Id: Idb0d6f97ea73eaf9056d28267ad7a42aa8cf6579
Signed-off-by: Michael Brown <michael@netdirect.ca>
Reviewed-on: http://review.gluster.org/4948
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'xlators/nfs/server/src/mount3.c')
| -rw-r--r-- | xlators/nfs/server/src/mount3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 39d736e7d17..f2b977eea1f 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; } |