From 1e4d02009d4517af4ee8ba0fe6d620a61978ac51 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 3 Jul 2013 12:52:41 +0200 Subject: src: callback: fix memory leak when ct has dynamically allocated attr Must free ct and exp using the _destroy functions, else we leak attributes with malloc'd data. Signed-off-by: Florian Westphal --- src/callback.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) (limited to 'src/callback.c') diff --git a/src/callback.c b/src/callback.c index 684d3b2..19cc663 100644 --- a/src/callback.c +++ b/src/callback.c @@ -82,31 +82,13 @@ int __callback(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data) break; } - switch(ret) { - case NFCT_CB_FAILURE: - if (ct) - free(ct); - if (exp) - free(exp); - ret = NFNL_CB_FAILURE; - break; - case NFCT_CB_STOP: - if (ct) - free(ct); - if (exp) - free(exp); - ret = NFNL_CB_STOP; - break; - case NFCT_CB_CONTINUE: - if (ct) - free(ct); - if (exp) - free(exp); - ret = NFNL_CB_CONTINUE; - break; - case NFCT_CB_STOLEN: - ret = NFNL_CB_CONTINUE; - break; - } + if (ret == NFCT_CB_STOLEN) + return NFNL_CB_CONTINUE; + + if (ct) + nfct_destroy(ct); + if (exp) + nfexp_destroy(exp); + return ret; } -- cgit v1.2.3