andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

features/trash : fixing trash dir option

Browse Source 
Previously, problem was caused due to buffer overflow of variable used
in the code. This patch fix the same. 

Change-Id: I3df5e06044470022f9475d93d33447db35384da2
BUG: 1132465
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: http://review.gluster.org/10215
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anoop C S <achiraya@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Jiffin Tony Thottan 2015-04-13 15:23:51 +05:30 committed by Vijay Bellur
parent 86b02afab7
commit ee255e239a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xlators/mgmt/glusterd/src/glusterd-op-sm.c
View File

@ -667,6 +667,7 @@ glusterd_op_stage_set_volume (dict_t *dict, char **op_errstr)
char *val_dup = NULL;
char str[100] = {0, };
char *trash_path = NULL;
int trash_path_len = 0;
int count = 0;
int dict_count = 0;
char errstr[2048] = {0, };
@ -988,9 +989,14 @@ glusterd_op_stage_set_volume (dict_t *dict, char **op_errstr)
brick_list) {
/* Check for local brick */
if (!gf_uuid_compare (brickinfo->uuid, MY_UUID)) {
trash_path = gf_strdup (brickinfo->path);
strcat(trash_path, "/");
strcat(trash_path, value);
trash_path_len = strlen (value) +
strlen (brickinfo->path) + 2;
trash_path = GF_CALLOC (1,
trash_path_len,
gf_common_mt_char);
snprintf (trash_path, trash_path_len,
"%s/%s", brickinfo->path,
value);
/* Checks whether a directory with
given option exists or not */
@ -1021,6 +1027,11 @@ glusterd_op_stage_set_volume (dict_t *dict, char **op_errstr)
goto out;
}
}
if (trash_path) {
GF_FREE (trash_path);
trash_path = NULL;
trash_path_len = 0;
}
}
} else if (!strcmp(key, "features.trash-dir") && !trash_enabled) {
snprintf (errstr, sizeof (errstr),