summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAnthony Lineham <anthony.lineham@alliedtelesis.co.nz>2015-10-22 00:17:03 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-11-09 13:32:14 +0100
commitc255cb2ed3c7960b2c68f45de1dc0ac2197c8f78 (patch)
treea388576a6b03b2ce438f2de452d7087b57397e81 /net
parentMerge branch 'master' of git://blackhole.kfki.hu/nf (diff)
downloadlinux-c255cb2ed3c7960b2c68f45de1dc0ac2197c8f78.tar.xz
linux-c255cb2ed3c7960b2c68f45de1dc0ac2197c8f78.zip
netfilter: Fix removal of GRE expectation entries created by PPTP
The uninitialized tuple structure caused incorrect hash calculation and the lookup failed. Link: https://bugzilla.kernel.org/show_bug.cgi?id=106441 Signed-off-by: Anthony Lineham <anthony.lineham@alliedtelesis.co.nz> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/netfilter/nf_nat_pptp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c
index 657d2307f031..b3ca21b2ba9b 100644
--- a/net/ipv4/netfilter/nf_nat_pptp.c
+++ b/net/ipv4/netfilter/nf_nat_pptp.c
@@ -45,7 +45,7 @@ static void pptp_nat_expected(struct nf_conn *ct,
struct net *net = nf_ct_net(ct);
const struct nf_conn *master = ct->master;
struct nf_conntrack_expect *other_exp;
- struct nf_conntrack_tuple t;
+ struct nf_conntrack_tuple t = {};
const struct nf_ct_pptp_master *ct_pptp_info;
const struct nf_nat_pptp *nat_pptp_info;
struct nf_nat_range range;