diff options
| author | N Balachandran <nbalacha@redhat.com> | 2015-11-04 15:20:49 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-11-04 03:55:08 -0800 |
| commit | c2c7a4e472ef737a2f3d8e97e4cd007442a5f5a2 (patch) | |
| tree | d58a596ded6999892b3dec10bd99f9dae826029b /xlators/cluster/dht/src/tier.c | |
| parent | 87788a273e6026fb125e0a73d8a9034a32a2e2dc (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
> 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>
(cherry picked from commit 499b43058049572e33b525ac669ef623d476fe41)
Change-Id: Id60f9c484dfbb02de6ebb44032160ad4cc94cb7f
BUG: 1277587
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/12502
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/tier.c')
| -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 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, |