cluster/tier : Files skipped during tier query parsing

The tier query parsing code was using fscanf to read each record.
As space is a delimiter for fscanf, filenames containing spaces
caused the parsing to return unexpected values causing various
issues in the tier process, including crashes due to buffer
 overflows.

Change-Id: Ife602cb7ecb158fccbc2c89e4d2959bd97098a87
BUG: 1276562
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/12469
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>

3 files changed, 87 insertions, 2 deletions

diff --git a/tests/basic/tier/file_with_spaces.t b/tests/basic/tier/file_with_spaces.t
new file mode 100755
index 00000000000..11bd1d2bf2a
--- /dev/null
+++ b/tests/basic/tier/file_with_spaces.t
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../tier.rc
+
+NUM_BRICKS=3
+DEMOTE_FREQ=5
+DEMOTE_TIMEOUT=10
+PROMOTE_FREQ=5
+
+FILE_SPACE="Testing filenames with spaces.log"
+
+
+# Creates a tiered volume with pure distribute hot and cold tiers
+# Both hot and cold tiers will have an equal number of bricks.
+
+function create_dist_tier_vol () {
+        mkdir $B0/cold
+        mkdir $B0/hot
+        TEST $CLI volume create $V0 $H0:$B0/cold/${V0}{0..$1}
+        TEST $CLI volume set $V0 performance.quick-read off
+        TEST $CLI volume set $V0 performance.io-cache off
+        TEST $CLI volume set $V0 features.ctr-enabled on
+        TEST $CLI volume start $V0
+        TEST $CLI volume attach-tier $V0 $H0:$B0/hot/${V0}{0..$1}
+        TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
+        TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
+        TEST $CLI volume set $V0 cluster.read-freq-threshold 50
+        TEST $CLI volume set $V0 cluster.write-freq-threshold 50
+}
+
+
+cleanup;
+
+#Basic checks
+TEST glusterd
+TEST pidof glusterd
+TEST $CLI volume info
+
+
+#Create and start a tiered volume
+create_dist_tier_vol $NUM_BRICKS
+
+# Mount FUSE
+TEST glusterfs -s $H0 --volfile-id $V0 $M0
+
+
+# The file will be created on the hot tier
+
+touch "$M0/$FILE_SPACE"
+
+# Get the path of the file on the hot tier
+HPATH=`find $B0/hot/ -name  "$FILE_SPACE"`
+echo "File path on hot tier: "$HPATH
+
+EXPECT "yes" exists_and_regular_file $HPATH
+
+# Wait for the tier process to demote the file
+sleep $DEMOTE_TIMEOUT
+
+# Get the path of the file on the cold tier
+CPATH=`find $B0/cold/ -name  "$FILE_SPACE"`
+echo "File path on cold tier: "$CPATH
+
+EXPECT "yes" exists_and_regular_file $CPATH
+
+cleanup;
+
diff --git a/tests/tier.rc b/tests/tier.rc
index 393d712f3bb..3fa6af6a40f 100644
--- a/tests/tier.rc
+++ b/tests/tier.rc
@@ -18,6 +18,22 @@ function is_sticky_set () {
 }
 
 
+function exists_and_regular_file () {
+        filepath=$1
+        if [ -n "$filepath" ];
+        then
+                if [ -k "$filepath" ]
+                then
+                        echo "no"
+                else
+                        echo "yes"
+                fi
+        else
+                echo "no"
+        fi
+}
+
+
 function check_counters {
     index=0
     ret=0
diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c
index 9930fe063e1..5f3752c2efb 100644
--- a/xlators/cluster/dht/src/tier.c
+++ b/xlators/cluster/dht/src/tier.c
@@ -303,7 +303,7 @@ tier_migrate_using_query_file (void *_args)
                 goto out;
 
         /* Per file */
-        while (fscanf (queryFILE, "%s", query_record_str) != EOF) {
+        while (fgets (query_record_str, sizeof (query_record_str), queryFILE)) {
 
                 per_file_status      = 0;
                 per_link_status      = 0;
@@ -315,7 +315,7 @@ tier_migrate_using_query_file (void *_args)
                         break;
                 }
 
-                memset (gfid_str, 0, UUID_CANONICAL_FORM_LEN+1);
+                memset (gfid_str, 0, sizeof (gfid_str));
                 memset (query_record->_link_info_str, 0, DB_QUERY_RECORD_SIZE);
 
                 if (tier_parse_query_str (query_record_str, gfid_str,