diff options
| author | N Balachandran <nbalacha@redhat.com> | 2015-10-30 12:46:22 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-11-03 06:23:16 -0800 |
| commit | 499b43058049572e33b525ac669ef623d476fe41 (patch) | |
| tree | b97cbceed9cd4e5f638aa0e0bc8fc8bcdd8e1176 /xlators/cluster/dht/src | |
| parent | 76eaae58654560d5a2cc72f3a2de5934801a27e9 (diff) | |
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>
Diffstat (limited to 'xlators/cluster/dht/src')
| -rw-r--r-- | xlators/cluster/dht/src/tier.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |