summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2015-04-30 16:28:27 +0530
committerNiels de Vos <ndevos@redhat.com>2015-06-28 12:52:19 -0700
commit5c8ee98a2dc6e7754ad37adcfd3a0e04014f266c (patch)
treedc5736fd211000ada5de229f9b7cc08f9edb4abd
parent734f68f4116fd32066aa49cda93707b02ba194cf (diff)
quota: Validate NULL inode from the entries received in readdirp_cbk
This is a backport of http://review.gluster.org/#/c/10416/ > In quota readdirp_cbk, inode ctx filled for the all entries > received. > In marker readdirp_cbk, files/directories are inspected for > dirty > There is no guarantee that entry->inode is populated. > If entry->inode is NULL, this needs to be treated as readdir > > Change-Id: Id2d17bb89e4770845ce1f13d73abc2b3c5826c06 > BUG: 1215550 > Signed-off-by: vmallika <vmallika@redhat.com> > Reviewed-on: http://review.gluster.org/10416 > Tested-by: NetBSD Build System > Tested-by: Gluster Build System <jenkins@build.gluster.com> > Reviewed-by: Raghavendra G <rgowdapp@redhat.com> > Tested-by: Raghavendra G <rgowdapp@redhat.com> Change-Id: If6578984ab1a33a3bdbaf0ec169f7c9548991144 BUG: 1217433 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/10472 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
-rw-r--r--xlators/features/marker/src/marker.c14
-rw-r--r--xlators/features/quota/src/quota.c5
2 files changed, 13 insertions, 6 deletions
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index 40777d5..ead4779 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -2749,8 +2749,13 @@ marker_build_ancestry_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
parent = NULL;
}
- ret = marker_inode_loc_fill (entry->inode,
- entry->d_name, &loc);
+ if (parent) {
+ ret = marker_inode_loc_fill (parent,
+ entry->d_name, &loc);
+ } else {
+ ret = marker_inode_loc_fill (entry->inode, NULL, &loc);
+ }
+
if (ret) {
gf_log (this->name, GF_LOG_WARNING, "Couldn't build "
"loc for %s/%s",
@@ -2797,8 +2802,9 @@ marker_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
}
list_for_each_entry (entry, &entries->list, list) {
- if ((strcmp (entry->d_name, ".") == 0) ||
- (strcmp (entry->d_name, "..") == 0))
+ if ((strcmp (entry->d_name, ".") == 0) ||
+ (strcmp (entry->d_name, "..") == 0) ||
+ entry->inode == NULL)
continue;
loc.parent = inode_ref (local->loc.inode);
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
index 7d60dfa..9dcfb74 100644
--- a/xlators/features/quota/src/quota.c
+++ b/xlators/features/quota/src/quota.c
@@ -3895,8 +3895,9 @@ quota_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
local = frame->local;
list_for_each_entry (entry, &entries->list, list) {
- if ((strcmp (entry->d_name, ".") == 0)
- || (strcmp (entry->d_name, "..") == 0))
+ if ((strcmp (entry->d_name, ".") == 0) ||
+ (strcmp (entry->d_name, "..") == 0) ||
+ entry->inode == NULL)
continue;
uuid_copy (loc.gfid, entry->d_stat.ia_gfid);