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

mgmt/glusterd: Fix possible use after free in glusterd_op_ac_commit_op()

Browse Source 
Fixes CID 1391418

Change-Id: I60ce6cd3b2528369f4dc1be81c0c15a1a806982a
updates: bz#789278
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Vijay Bellur 2018-08-12 18:02:17 -07:00 committed by Atin Mukherjee
parent 2189dedb56
commit d339f87a6f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5985,6 +5985,7 @@ glusterd_op_ac_commit_op (glusterd_op_sm_event_t *event, void *ctx)
xlator_t *this = NULL;
uuid_t *txn_id = NULL;
glusterd_op_info_t txn_op_info = {{0},};
gf_boolean_t need_cleanup = _gf_true;
this = THIS;
GF_ASSERT (this);
@ -6041,6 +6042,7 @@ glusterd_op_ac_commit_op (glusterd_op_sm_event_t *event, void *ctx)
"Failed to set transaction id.");
if (txn_op_info.skip_locking)
ret = glusterd_clear_txn_opinfo (txn_id);
need_cleanup = _gf_false;
GF_FREE (txn_id);
goto out;
}
@ -6057,7 +6059,7 @@ out:
/* for no volname transactions, the txn_opinfo needs to be cleaned up
* as there's no unlock event triggered
*/
if (txn_id && txn_op_info.skip_locking)
if (need_cleanup && txn_id && txn_op_info.skip_locking)
ret = glusterd_clear_txn_opinfo (txn_id);
gf_msg_debug (this->name, 0, "Returning with %d", ret);