diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-21 01:10:19 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-21 06:09:05 +0200 |
| commit | 81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91 (patch) | |
| tree | 40370ca95f416fd88cb93e5c252623e282b3553e /net/netfilter/xt_CT.c | |
| parent | 8cfd23e6740158817d2045915f6ea5a2daf11bce (diff) | |
| parent | 938049e18dca57bcd2f93986fc1cbb5a83cdf027 (diff) | |
| download | linux-81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91.tar.gz linux-81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91.tar.bz2 linux-81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflicts with conntrack template fixes.
Conflicts:
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_synproxy_core.c
net/netfilter/xt_CT.c
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/xt_CT.c')
| -rw-r--r-- | net/netfilter/xt_CT.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c index 346509825a80..8e524898ccea 100644 --- a/net/netfilter/xt_CT.c +++ b/net/netfilter/xt_CT.c @@ -224,9 +224,10 @@ static int xt_ct_tg_check(const struct xt_tgchk_param *par, zone.flags |= NF_CT_FLAG_MARK; ct = nf_ct_tmpl_alloc(par->net, &zone, GFP_KERNEL); - ret = PTR_ERR(ct); - if (IS_ERR(ct)) + if (!ct) { + ret = -ENOMEM; goto err2; + } ret = 0; if ((info->ct_events || info->exp_events) && |