Check returnvalue of nfct_nat()
Subsystems (2)
PATCH 1/1 Check returnvalue of nfct_nat()
We need to check the returnvalue of nfct_nat() (and nfct_help()) Otherwise we end up with the calltraces below.
Steps to reproduce:
1. Slow qemu machine without connectivity to the dns-servers.
2. Load nf_nat in the qemu machine.
3. Start an ssh to the qemu machine, this takes time as the qemu machine is slow and lacks dns.
4. Load iptable_nat in the qemu machine before the ssh has completed.
5. Watch it blow up as it tries to use the returnvalue of nfct_nat() on a connection without nat info, I believe it is a resend of a dns-query as it is an udp packet that causes the crash in one of the cases below.
Some of the checks in the patch might not be strictly neccessary, I havn't audited the calls, it was 4 AM :) The check added in nf_nat_fn() should take care of things for us...
BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000 EIP is at __list_add+0x28/0x70 [<c01fd66e>] list_add+0x1e/0x20 [<c8814892>] nf_nat_setup_info+0x292/0x620 [nf_nat] [<c886a0d6>] alloc_null_binding_confirmed+0x46/0x60 [iptable_nat] [<c886a551>] nf_nat_fn+0x1c1/0x1d0 [iptable_nat] [<c886a865>] nf_nat_local_fn+0x65/0xf0 [iptable_nat] [<c02879f0>] nf_iterate+0x60/0x90 [<c0287b82>] nf_hook_slow+0x52/0xd0 [<c0290f7a>] ip_push_pending_frames+0x3ea/0x4b0 [<c02b0d4b>] udp_push_pending_frames+0x15b/0x360 [<c02b1f99>] udp_sendmsg+0x2c9/0x690 [<c02b84c5>] inet_sendmsg+0x35/0x60 [<c02650bd>] sock_sendmsg+0xcd/0x100 [<c0265433>] sys_sendto+0xd3/0x100 [<c0265492>] sys_send+0x32/0x40 [<c02662a2>] sys_socketcall+0x142/0x260 [<c01031f3>] syscall_call+0x7/0xb
or this:
BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000 EIP is at __list_add+0x28/0x70 [<c01fd66e>] list_add+0x1e/0x20 [<c8814892>] nf_nat_setup_info+0x292/0x620 [nf_nat] [<c886a367>] nf_nat_rule_find+0x97/0xc0 [iptable_nat] [<c886a46f>] nf_nat_fn+0xdf/0x1d0 [iptable_nat] [<c886a5fe>] nf_nat_in+0x3e/0xb0 [iptable_nat] [<c02879f0>] nf_iterate+0x60/0x90 [<c0287b82>] nf_hook_slow+0x52/0xd0 [<c028de9d>] ip_rcv+0x31d/0x5a0 [<c026ffbf>] netif_receive_skb+0x23f/0x3b0 [<c0235d95>] cp_rx_poll+0x235/0x540 [<c0271d98>] net_rx_action+0xa8/0x160 [<c0121412>] __do_softirq+0x92/0x120 [<c0121505>] do_softirq+0x65/0x70 [<c01218d5>] irq_exit+0x45/0x50 [<c010ebf7>] smp_apic_timer_interrupt+0xb7/0xe0 [<c0103ca2>] apic_timer_interrupt+0x2a/0x30 [<c0101d8c>] cpu_idle+0x6c/0x90 [<c0100725>] rest_init+0x35/0x40 [<c03958ee>] start_kernel+0x37e/0x430 [<00000000>] 0x0
--- net/ipv4/netfilter/nf_nat_core.c | 17 ++++++++++++++-- net/ipv4/netfilter/nf_nat_h323.c | 32 +++++++++++++++++++++++++++---- net/ipv4/netfilter/nf_nat_helper.c | 9 ++++++++ net/ipv4/netfilter/nf_nat_helper_pptp.c | 33 +++++++++++++++++++++++++------- net/ipv4/netfilter/nf_nat_standalone.c | 3 ++ net/netfilter/nf_conntrack_core.c | 2 - 6 files changed, 82 insertions(+), 14 deletions(-)
net/ipv4/netfilter/nf_nat_core.c +15 -2
@@ -98,6 +98,9 @@ static void nf_nat_cleanup_conntrack(strreturn ; nat =nfct_nat (conn); +if (!nat) +return ; +write_lock_bh (&nf_nat_lock);list_del (&nat->info.bysource);write_unlock_bh (&nf_nat_lock);
@@ -289,8 +292,8 @@ nf_nat_setup_info(struct nf_conn *conntr unsigned int hooknum) {struct nf_conntrack_tuple curr_tuple, new_tuple; -struct nf_conn_nat *nat =nfct_nat (conntrack); -struct nf_nat_info *info = &nat->info; +struct nf_conn_nat *nat; +struct nf_nat_info *info;int have_to_hash = !(conntrack->status &IPS_NAT_DONE_MASK );enum nf_nat_manip_type maniptype =HOOK2MANIP (hooknum);
@@ -300,6 +303,12 @@ nf_nat_setup_info(struct nf_conn *conntr || hooknum == NF_IP_LOCAL_OUT);BUG_ON (nf_nat_initialized (conntrack, maniptype)); + nat =nfct_nat (conntrack); +if (!nat) +return NF_DROP ; + + info = &nat->info; +/* What we've got will look like inverse of reply. Normally this is what is in the conntrack, except for prior manipulations (future optimization: if num_manips == 0,
@@ -626,6 +635,10 @@ static int __init nf_nat_init(void)static int clean_nat (struct nf_conn *i,void *data) {struct nf_conn_nat *nat =nfct_nat (i); + +if (!nat) +return 0 ; +memset (nat,0 ,sizeof (nat)); i->status &= ~(IPS_NAT_MASK |IPS_NAT_DONE_MASK |IPS_SEQ_ADJUST );return 0 ;
net/ipv4/netfilter/nf_nat_helper.c +9 -0
@@ -56,6 +56,9 @@ adjust_tcp_sequence(u32 seq,struct nf_nat_seq *this_way, *other_way;struct nf_conn_nat *nat =nfct_nat (ct); +if (!nat) +return ; +DEBUGP ("nf_nat_resize_packet: old_size = %u, new_size = %u\n" , (*skb)->len, new_size);
@@ -329,6 +332,9 @@ nf_nat_sack_adjust(struct sk_buff **pskbunsigned int dir, optoff, optend;struct nf_conn_nat *nat =nfct_nat (ct); +if (!nat) +return 0 ; + optoff = (*pskb)->nh.iph->ihl*4 +sizeof (struct tcphdr ); optend = (*pskb)->nh.iph->ihl*4 + tcph->doff*4 ;
@@ -377,6 +383,9 @@ nf_nat_seq_adjust(struct sk_buff **pskb,struct nf_conn_nat *nat =nfct_nat (ct);struct nf_nat_seq *this_way, *other_way; +if (!nat) +return 0 ; + dir =CTINFO2DIR (ctinfo); this_way = &nat->info.seq[dir];
net/ipv4/netfilter/nf_nat_helper_pptp.c +26 -7
@@ -53,9 +53,14 @@ static void pptp_nat_expected(struct nf_struct nf_ct_pptp_master *ct_pptp_info;struct nf_nat_pptp *nat_pptp_info;struct ip_nat_range range; +struct nf_conn_help *help =nfct_help (master); +struct nf_conn_nat *nat =nfct_nat (master); - ct_pptp_info = &nfct_help (master)->help.ct_pptp_info; - nat_pptp_info = &nfct_nat (master)->help.nat_pptp_info; +if (!help || !nat) +return ; + + ct_pptp_info = &help->help.ct_pptp_info; + nat_pptp_info = &nat->help.nat_pptp_info;/* And here goes the grand finale of corrosion... */ if (exp->dir ==IP_CT_DIR_ORIGINAL ) {
@@ -129,9 +134,14 @@ pptp_outbound_pkt(struct sk_buff **pskb,u_int16_t msg;__be16 new_callid;unsigned int cid_off; +struct nf_conn_help *help =nfct_help (ct); +struct nf_conn_nat *nat =nfct_nat (ct); + +if (!help || !nat) +return NF_DROP ; - ct_pptp_info = &nfct_help (ct)->help.ct_pptp_info; - nat_pptp_info = &nfct_nat (ct)->help.nat_pptp_info; + ct_pptp_info = &help->help.ct_pptp_info; + nat_pptp_info = &nat->help.nat_pptp_info; new_callid = ct_pptp_info->pns_call_id;
@@ -198,9 +208,14 @@ pptp_exp_gre(struct nf_conntrack_expectstruct nf_conn *ct = expect_orig->master;struct nf_ct_pptp_master *ct_pptp_info;struct nf_nat_pptp *nat_pptp_info; +struct nf_conn_help *help =nfct_help (ct); +struct nf_conn_nat *nat =nfct_nat (ct); - ct_pptp_info = &nfct_help (ct)->help.ct_pptp_info; - nat_pptp_info = &nfct_nat (ct)->help.nat_pptp_info; +if (!help || !nat) +return ; + + ct_pptp_info = &help->help.ct_pptp_info; + nat_pptp_info = &nat->help.nat_pptp_info;/* save original PAC call ID in nat_info */ nat_pptp_info->pac_call_id = ct_pptp_info->pac_call_id;
@@ -230,8 +245,12 @@ pptp_inbound_pkt(struct sk_buff **pskb,u_int16_t msg;__be16 new_pcid;unsigned int pcid_off; +struct nf_conn_nat *nat =nfct_nat (ct); + +if (!nat) +return NF_DROP ; - nat_pptp_info = &nfct_nat (ct)->help.nat_pptp_info; + nat_pptp_info = &nat->help.nat_pptp_info; new_pcid = nat_pptp_info->pns_call_id;switch (msg =ntohs (ctlh->messageType)) {
net/ipv4/netfilter/nf_nat_standalone.c +3 -0
@@ -138,6 +138,9 @@ nf_nat_fn(unsigned int hooknum,return NF_ACCEPT ; nat =nfct_nat (ct); +if (!nat) +return NF_DROP ; +switch (ctinfo) {case IP_CT_RELATED :case IP_CT_RELATED +IP_CT_IS_REPLY :
net/ipv4/netfilter/nf_nat_h323.c +28 -4
@@ -107,12 +107,18 @@ static int set_sig_addr(struct sk_buff *unsigned char **data, TransportAddress *taddr, int count) { - struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; + struct nf_conn_help *help = nfct_help(ct); +struct nf_ct_h323_master *info;int dir =CTINFO2DIR (ctinfo);int i;__be16 port;union nf_conntrack_address addr; +if (!help) +return 0 ; + + info = &help->help.ct_h323_info; +for (i =0 ; i < count; i++) {if (get_h225_addr (ct, *data, &taddr[i], &addr, &port)) { if (addr.ip == ct->tuplehash[dir].tuple.src.u3.ip &&
@@ -196,11 +202,17 @@ static int nat_rtp_rtcp(struct sk_buff *struct nf_conntrack_expect *rtp_exp, struct nf_conntrack_expect *rtcp_exp) { - struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; + struct nf_conn_help *help = nfct_help(ct); +struct nf_ct_h323_master *info;int dir =CTINFO2DIR (ctinfo);int i;u_int16_t nated_port; +if (!help) +return 0 ; + + info = &help->help.ct_h323_info; +/* Set expectations for NAT */ rtp_exp->saved_proto.udp.port = rtp_exp->tuple.dst.u.udp.port; rtp_exp->expectfn = nf_nat_follow_master;
@@ -343,10 +355,16 @@ static int nat_h245(struct sk_buff **psk TransportAddress *taddr, __be16 port, struct nf_conntrack_expect *exp) { - struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; + struct nf_conn_help *help = nfct_help(ct); +struct nf_ct_h323_master *info;int dir =CTINFO2DIR (ctinfo);u_int16_t nated_port =ntohs (port); +if (!help) +return 0 ; + + info = &help->help.ct_h323_info; +/* Set expectations for NAT */ exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; exp->expectfn = ip_nat_h245_expect;
@@ -431,11 +449,17 @@ static int nat_q931(struct sk_buff **psk unsigned char **data, TransportAddress *taddr, int idx, __be16 port, struct nf_conntrack_expect *exp) { - struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; + struct nf_conn_help *help = nfct_help(ct); +struct nf_ct_h323_master *info;int dir =CTINFO2DIR (ctinfo);u_int16_t nated_port =ntohs (port);union nf_conntrack_address addr; +if (!help) +return 0 ; + + info = &help->help.ct_h323_info; +/* Set expectations for NAT */ exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; exp->expectfn = ip_nat_q931_expect;
net/netfilter/nf_conntrack_core.c +1 -1
@@ -859,7 +859,7 @@ void nf_conntrack_alter_reply(struct nf_NF_CT_DUMP_TUPLE (newreply); conntrack->tuplehash[IP_CT_DIR_REPLY ].tuple = *newreply; -if (!conntrack->master && help->expecting ==0 ) +if (!conntrack->master && help && help->expecting ==0 ) help->helper =__nf_ct_helper_find (newreply);write_unlock_bh (&nf_conntrack_lock); }
Signature · 1 line
/Martin
Quoted 12 lines · Martin Josefsson
We need to check the returnvalue of
nfct_nat()(andnfct_help()) Otherwise we end up with the calltraces below.Steps to reproduce:
1. Slow qemu machine without connectivity to the dns-servers.
2. Loadnf_natin the qemu machine.
3. Start an ssh to the qemu machine, this takes time as the qemu machine is slow and lacks dns.
4. Loadiptable_natin the qemu machine before the ssh has completed.
5. Watch it blow up as it tries to use the returnvalue ofnfct_nat()on a connection without nat info, I believe it is a resend of a dns-query as it is an udp packet that causes the crash in one of the cases below.
Thanks, I just noticed the same crash when loading iptable_nat over ssh (it works fine with the additional checks now).
Quoted 3 lines
Some of the checks in the patch might not be strictly neccessary, I havn't audited the calls, it was 4 AM :) The check added in
nf_nat_fn()should take care of things for us...
The nfct_help part is a bit more trickier since not only can nfct_help return NULL, but nfct_help(ct)->help can become NULL as well when the helper is unloaded even while it is still executing. I want to think about this some more, but I went over the nfct_nat part and added the ones that look necessary, it came down to only two :)
net/ipv4/netfilter/nf_nat_core.c static void nf_nat_cleanup_conntrack(str · line 103
Quoted 11 lines
Index:
nf-2.6.20-nat.quilt/net/ipv4/netfilter/nf_nat_core.c
===================================================================net/ipv4/netfilter/nf_nat_core.c +3
-0@@ -98,6 +98,9 @@ static void nf_nat_cleanup_conntrack(strreturn ; nat =nfct_nat (conn); +if (!nat) +return ; +
This one should be unnecessary since we're checking for IPS_NAT_DONE_MASK already.
Quoted 15 lines
net/ipv4/netfilter/nf_nat_core.c +2
-2write_lock_bh (&nf_nat_lock);list_del (&nat->info.bysource);write_unlock_bh (&nf_nat_lock);@@ -289,8 +292,8 @@ nf_nat_setup_info(struct nf_conn *conntr unsigned int hooknum) {struct nf_conntrack_tuple curr_tuple, new_tuple; -struct nf_conn_nat *nat =nfct_nat (conntrack); -struct nf_nat_info *info = &nat->info; +struct nf_conn_nat *nat; +struct nf_nat_info *info;int have_to_hash = !(conntrack->status &IPS_NAT_DONE_MASK );enum nf_nat_manip_type maniptype =HOOK2MANIP (hooknum);
net/ipv4/netfilter/nf_nat_core.c nf_nat_setup_info(struct nf_conn *conntr · line 311
Quoted 9 lines
net/ipv4/netfilter/nf_nat_core.c +6
-0@@ -300,6 +303,12 @@ nf_nat_setup_info(struct nf_conn *conntr || hooknum == NF_IP_LOCAL_OUT);BUG_ON (nf_nat_initialized (conntrack, maniptype)); + nat =nfct_nat (conntrack); +if (!nat) +return NF_DROP ; + + info = &nat->info; +
This one should be unnecessary as well with the check in nf_nat_fn() since a conntrack without will never have a NAT mapping created.
net/ipv4/netfilter/nf_nat_core.c static int __init nf_nat_init(void) · line 641
Quoted 11 lines
net/ipv4/netfilter/nf_nat_core.c +4
-0/* What we've got will look like inverse of reply. Normally this is what is in the conntrack, except for prior manipulations (future optimization: if num_manips == 0, @@ -626,6 +635,10 @@ static int __init nf_nat_init(void)static int clean_nat (struct nf_conn *i,void *data) {struct nf_conn_nat *nat =nfct_nat (i); + +if (!nat) +return 0 ; +
This one is needed.
Quoted 28 lines
net/ipv4/netfilter/nf_nat_core.c +0
-0memset (nat,0 ,sizeof (nat)); i->status &= ~(IPS_NAT_MASK |IPS_NAT_DONE_MASK |IPS_SEQ_ADJUST );return 0 ;Index:
nf-2.6.20-nat.quilt/net/ipv4/netfilter/nf_nat_helper.c
===================================================================net/ipv4/netfilter/nf_nat_helper.c +6
-0@@ -56,6 +56,9 @@ adjust_tcp_sequence(u32 seq,struct nf_nat_seq *this_way, *other_way;struct nf_conn_nat *nat =nfct_nat (ct); +if (!nat) +return ; +DEBUGP ("nf_nat_resize_packet: old_size = %u, new_size = %u\n" , (*skb)->len, new_size);@@ -329,6 +332,9 @@ nf_nat_sack_adjust(struct sk_buff **pskbunsigned int dir, optoff, optend;struct nf_conn_nat *nat =nfct_nat (ct); +if (!nat) +return 0 ; + optoff = (*pskb)->nh.iph->ihl*4 +sizeof (struct tcphdr ); optend = (*pskb)->nh.iph->ihl*4 + tcph->doff*4 ;
net/ipv4/netfilter/nf_nat_helper.c nf_nat_seq_adjust(struct sk_buff **pskb, · line 389
Quoted 7 lines
net/ipv4/netfilter/nf_nat_helper.c +3
-0@@ -377,6 +383,9 @@ nf_nat_seq_adjust(struct sk_buff **pskb,struct nf_conn_nat *nat =nfct_nat (ct);struct nf_nat_seq *this_way, *other_way; +if (!nat) +return 0 ; + dir =CTINFO2DIR (ctinfo);
These should all be unnecessary since sequence adjustment can only happen if a NAT helper mangled the packet, which it shouldn't do in the first place if no NAT is set up. The checks for IPS_NAT_MASK before calling the hooks make sure of this.
Quoted 58 lines
net/ipv4/netfilter/nf_nat_helper.c +0
-0this_way = &nat->info.seq[dir];Index:
nf-2.6.20-nat.quilt/net/ipv4/netfilter/nf_nat_helper_pptp.c
===================================================================net/ipv4/netfilter/nf_nat_helper_pptp.c +21
-6@@ -53,9 +53,14 @@ static void pptp_nat_expected(struct nf_struct nf_ct_pptp_master *ct_pptp_info;struct nf_nat_pptp *nat_pptp_info;struct ip_nat_range range; +struct nf_conn_help *help =nfct_help (master); +struct nf_conn_nat *nat =nfct_nat (master); - ct_pptp_info = &nfct_help (master)->help.ct_pptp_info; - nat_pptp_info = &nfct_nat (master)->help.nat_pptp_info; +if (!help || !nat) +return ; + + ct_pptp_info = &help->help.ct_pptp_info; + nat_pptp_info = &nat->help.nat_pptp_info;/* And here goes the grand finale of corrosion... */ if (exp->dir ==IP_CT_DIR_ORIGINAL ) {@@ -129,9 +134,14 @@ pptp_outbound_pkt(struct sk_buff **pskb,u_int16_t msg;__be16 new_callid;unsigned int cid_off; +struct nf_conn_help *help =nfct_help (ct); +struct nf_conn_nat *nat =nfct_nat (ct); + +if (!help || !nat) +return NF_DROP ; - ct_pptp_info = &nfct_help (ct)->help.ct_pptp_info; - nat_pptp_info = &nfct_nat (ct)->help.nat_pptp_info; + ct_pptp_info = &help->help.ct_pptp_info; + nat_pptp_info = &nat->help.nat_pptp_info; new_callid = ct_pptp_info->pns_call_id;@@ -198,9 +208,14 @@ pptp_exp_gre(struct nf_conntrack_expectstruct nf_conn *ct = expect_orig->master;struct nf_ct_pptp_master *ct_pptp_info;struct nf_nat_pptp *nat_pptp_info; +struct nf_conn_help *help =nfct_help (ct); +struct nf_conn_nat *nat =nfct_nat (ct); - ct_pptp_info = &nfct_help (ct)->help.ct_pptp_info; - nat_pptp_info = &nfct_nat (ct)->help.nat_pptp_info; +if (!help || !nat) +return ; + + ct_pptp_info = &help->help.ct_pptp_info; + nat_pptp_info = &nat->help.nat_pptp_info;/* save original PAC call ID in nat_info */ nat_pptp_info->pac_call_id = ct_pptp_info->pac_call_id;@@ -230,8 +245,12 @@ pptp_inbound_pkt(struct sk_buff **pskb,u_int16_t msg;
net/ipv4/netfilter/nf_nat_helper_pptp.c pptp_inbound_pkt(struct sk_buff **pskb, · line 254
Quoted 10 lines
net/ipv4/netfilter/nf_nat_helper_pptp.c +5
-1__be16 new_pcid;unsigned int pcid_off; +struct nf_conn_nat *nat =nfct_nat (ct); + +if (!nat) +return NF_DROP ; - nat_pptp_info = &nfct_nat (ct)->help.nat_pptp_info; + nat_pptp_info = &nat->help.nat_pptp_info; new_pcid = nat_pptp_info->pns_call_id;
nf_nat_fn() should also help here since the conntrack never has IPS_NAT_MASK set.
net/ipv4/netfilter/nf_nat_standalone.c nf_nat_fn(unsigned int hooknum, · line 143
Quoted 13 lines
net/ipv4/netfilter/nf_nat_helper_pptp.c +0
-0switch (msg =ntohs (ctlh->messageType)) {Index:
nf-2.6.20-nat.quilt/net/ipv4/netfilter/nf_nat_standalone.c
===================================================================net/ipv4/netfilter/nf_nat_standalone.c +3
-0@@ -138,6 +138,9 @@ nf_nat_fn(unsigned int hooknum,return NF_ACCEPT ; nat =nfct_nat (ct); +if (!nat) +return NF_DROP ; +
This is needed.
Quoted 73 lines
net/ipv4/netfilter/nf_nat_standalone.c +0
-0switch (ctinfo) {case IP_CT_RELATED :case IP_CT_RELATED +IP_CT_IS_REPLY :Index:
nf-2.6.20-nat.quilt/net/ipv4/netfilter/nf_nat_h323.c
===================================================================net/ipv4/netfilter/nf_nat_h323.c +23
-4@@ -107,12 +107,18 @@ static int set_sig_addr(struct sk_buff *unsigned char **data, TransportAddress *taddr, int count) { - struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; + struct nf_conn_help *help = nfct_help(ct); +struct nf_ct_h323_master *info;int dir =CTINFO2DIR (ctinfo);int i;__be16 port;union nf_conntrack_address addr; +if (!help) +return 0 ; + + info = &help->help.ct_h323_info; +for (i =0 ; i < count; i++) {if (get_h225_addr (ct, *data, &taddr[i], &addr, &port)) { if (addr.ip == ct->tuplehash[dir].tuple.src.u3.ip &&@@ -196,11 +202,17 @@ static int nat_rtp_rtcp(struct sk_buff *struct nf_conntrack_expect *rtp_exp, struct nf_conntrack_expect *rtcp_exp) { - struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; + struct nf_conn_help *help = nfct_help(ct); +struct nf_ct_h323_master *info;int dir =CTINFO2DIR (ctinfo);int i;u_int16_t nated_port; +if (!help) +return 0 ; + + info = &help->help.ct_h323_info; +/* Set expectations for NAT */ rtp_exp->saved_proto.udp.port = rtp_exp->tuple.dst.u.udp.port; rtp_exp->expectfn = nf_nat_follow_master;@@ -343,10 +355,16 @@ static int nat_h245(struct sk_buff **psk TransportAddress *taddr, __be16 port, struct nf_conntrack_expect *exp) { - struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; + struct nf_conn_help *help = nfct_help(ct); +struct nf_ct_h323_master *info;int dir =CTINFO2DIR (ctinfo);u_int16_t nated_port =ntohs (port); +if (!help) +return 0 ; + + info = &help->help.ct_h323_info; +/* Set expectations for NAT */ exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; exp->expectfn = ip_nat_h245_expect;@@ -431,11 +449,17 @@ static int nat_q931(struct sk_buff **psk unsigned char **data, TransportAddress *taddr, int idx, __be16 port, struct nf_conntrack_expect *exp) { - struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; + struct nf_conn_help *help = nfct_help(ct); +struct nf_ct_h323_master *info;int dir =CTINFO2DIR (ctinfo);u_int16_t nated_port =ntohs (port);
net/ipv4/netfilter/nf_nat_h323.c static int nat_q931(struct sk_buff **psk · line 465
Quoted 10 lines
net/ipv4/netfilter/nf_nat_h323.c +5
-0union nf_conntrack_address addr; +if (!help) +return 0 ; + + info = &help->help.ct_h323_info; +/* Set expectations for NAT */ exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; exp->expectfn = ip_nat_q931_expect;
Same here as for PPtP.
net/ipv4/netfilter/nf_nat_core.c +3 -0
@@ -626,6 +626,9 @@ static int __init nf_nat_init(void)static int clean_nat (struct nf_conn *i,void *data) {struct nf_conn_nat *nat =nfct_nat (i); + +if (!nat) +return 0 ;memset (nat,0 ,sizeof (nat)); i->status &= ~(IPS_NAT_MASK |IPS_NAT_DONE_MASK |IPS_SEQ_ADJUST );return 0 ;
net/ipv4/netfilter/nf_nat_standalone.c +3 -0
@@ -138,6 +138,9 @@ nf_nat_fn(unsigned int hooknum,return NF_ACCEPT ; nat =nfct_nat (ct); +if (!nat) +return NF_DROP ; +switch (ctinfo) {case IP_CT_RELATED :case IP_CT_RELATED +IP_CT_IS_REPLY :
Quoted 2 lines · Patrick McHardy
Thanks, I just noticed the same crash when loading
iptable_natover ssh (it works fine with the additional checks now).
:)
I seem to always find new bugs when porting my patches to a newer kernels :)
This time it was this bug and a strange locking bug in what appears to be socket locking, Peter Zijlstra just mailed me a possible fix for that.
Quoted 10 lines
Quoted 3 lines
Some of the checks in the patch might not be strictly neccessary, I havn't audited the calls, it was 4 AM :) The check added in
nf_nat_fn()should take care of things for us...The
nfct_helppart is a bit more trickier since not only cannfct_helpreturn NULL, but nfct_help(ct)->help can become NULL as well when the helper is unloaded even while it is still executing. I want to think about this some more, but I went over thenfct_natpart and added the ones that look necessary, it came down to only two :)
:) My brain was shutting down and the NAT core is still a lot of voodoo for me :) I just added checks everywhere so I could continue to test my patches, great that you reviewed it and sorted out which ones are really neccessary.
I'll give your revised patch a go and see if it survives my tests.
Thanks.
Signature · 1 line
/Martin