Skip to content

Commit aba55cb

Browse files
JeffyCNgregkh
authored andcommitted
netfilter: nfnl_cthelper: Fix memory leak
[ Upstream commit f83bf8da1135ca635aac8f062cad3f001fcf3a26 ] We have memory leaks of nf_conntrack_helper & expect_policy. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b9fd330 commit aba55cb

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

net/netfilter/nfnetlink_cthelper.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ nfnl_cthelper_create(const struct nlattr * const tb[],
216216

217217
ret = nfnl_cthelper_parse_expect_policy(helper, tb[NFCTH_POLICY]);
218218
if (ret < 0)
219-
goto err;
219+
goto err1;
220220

221221
strncpy(helper->name, nla_data(tb[NFCTH_NAME]), NF_CT_HELPER_NAME_LEN);
222222
helper->data_len = ntohl(nla_get_be32(tb[NFCTH_PRIV_DATA_LEN]));
@@ -247,10 +247,12 @@ nfnl_cthelper_create(const struct nlattr * const tb[],
247247

248248
ret = nf_conntrack_helper_register(helper);
249249
if (ret < 0)
250-
goto err;
250+
goto err2;
251251

252252
return 0;
253-
err:
253+
err2:
254+
kfree(helper->expect_policy);
255+
err1:
254256
kfree(helper);
255257
return ret;
256258
}
@@ -696,6 +698,8 @@ nfnl_cthelper_del(struct sock *nfnl, struct sk_buff *skb,
696698

697699
found = true;
698700
nf_conntrack_helper_unregister(cur);
701+
kfree(cur->expect_policy);
702+
kfree(cur);
699703
}
700704
}
701705
/* Make sure we return success if we flush and there is no helpers */
@@ -759,6 +763,8 @@ static void __exit nfnl_cthelper_exit(void)
759763
continue;
760764

761765
nf_conntrack_helper_unregister(cur);
766+
kfree(cur->expect_policy);
767+
kfree(cur);
762768
}
763769
}
764770
}

0 commit comments

Comments
 (0)