|
@@ -167,8 +167,10 @@ xt_ct_set_timeout(struct nf_conn *ct, const struct xt_tgchk_param *par,
|
|
|
goto err_put_timeout;
|
|
|
}
|
|
|
timeout_ext = nf_ct_timeout_ext_add(ct, timeout, GFP_ATOMIC);
|
|
|
- if (timeout_ext == NULL)
|
|
|
+ if (!timeout_ext) {
|
|
|
ret = -ENOMEM;
|
|
|
+ goto err_put_timeout;
|
|
|
+ }
|
|
|
|
|
|
rcu_read_unlock();
|
|
|
return ret;
|
|
@@ -200,6 +202,7 @@ static int xt_ct_tg_check(const struct xt_tgchk_param *par,
|
|
|
struct xt_ct_target_info_v1 *info)
|
|
|
{
|
|
|
struct nf_conntrack_zone zone;
|
|
|
+ struct nf_conn_help *help;
|
|
|
struct nf_conn *ct;
|
|
|
int ret = -EOPNOTSUPP;
|
|
|
|
|
@@ -248,7 +251,7 @@ static int xt_ct_tg_check(const struct xt_tgchk_param *par,
|
|
|
if (info->timeout[0]) {
|
|
|
ret = xt_ct_set_timeout(ct, par, info->timeout);
|
|
|
if (ret < 0)
|
|
|
- goto err3;
|
|
|
+ goto err4;
|
|
|
}
|
|
|
__set_bit(IPS_CONFIRMED_BIT, &ct->status);
|
|
|
nf_conntrack_get(&ct->ct_general);
|
|
@@ -256,6 +259,10 @@ out:
|
|
|
info->ct = ct;
|
|
|
return 0;
|
|
|
|
|
|
+err4:
|
|
|
+ help = nfct_help(ct);
|
|
|
+ if (help)
|
|
|
+ module_put(help->helper->me);
|
|
|
err3:
|
|
|
nf_ct_tmpl_free(ct);
|
|
|
err2:
|