From c2c7a4e472ef737a2f3d8e97e4cd007442a5f5a2 Mon Sep 17 00:00:00 2001 From: N Balachandran Date: Wed, 4 Nov 2015 15:20:49 +0530 Subject: 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 > Signed-off-by: N Balachandran > Reviewed-on: http://review.gluster.org/12469 > Tested-by: NetBSD Build System > Tested-by: Gluster Build System > Reviewed-by: Dan Lambright > Tested-by: Dan Lambright (cherry picked from commit 499b43058049572e33b525ac669ef623d476fe41) Change-Id: Id60f9c484dfbb02de6ebb44032160ad4cc94cb7f BUG: 1277587 Signed-off-by: N Balachandran Reviewed-on: http://review.gluster.org/12502 Tested-by: NetBSD Build System Reviewed-by: Dan Lambright Tested-by: Dan Lambright --- xlators/cluster/dht/src/tier.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c index bda4bf799c7..b152a43f72e 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -306,7 +306,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; @@ -318,7 +318,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, -- cgit