netfilter: fix endian bug in conntrack printks
Subsystems (3)
PATCH 1/3 netfilter: fix endian bug in conntrack printks
dcc_ip is treated as a host-endian value in the first printk, but the second printk uses %pI4 which expects a be32. This will cause a mismatch between the debug statement and the warning statement.
Treat as a be32 throughout and avoid some byteswapping during some comparisions, and allow another user of HIPQUAD to bite the dust.
---
Dave, this is probably suitable for 2.6.30 as a bugfix, I include the other removal patch only because it is the last user of HIPQUAD.
net/netfilter/nf_conntrack_irc.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
net/netfilter/nf_conntrack_irc.c +8 -7
@@ -66,7 +66,7 @@ static const char *const dccprotos[] = {* ad_beg_p returns pointer to first byte of addr data * ad_end_p returns pointer to last byte of addr data */ -static int parse_dcc (char *data,const char *data_end,u_int32_t *ip, +static int parse_dcc (char *data,const char *data_end,__be32 *ip,u_int16_t *port,char **ad_beg_p,char **ad_end_p) {char *tmp;
@@ -85,7 +85,7 @@ static int parse_dcc(char *data, const char *data_end, u_int32_t *ip,return -1 ; *ad_beg_p = data; - *ip =simple_strtoul (data, &data,10 ); + *ip =cpu_to_be32 (simple_strtoul (data, &data,10 ));/* skip blanks between ip and port */ while (*data ==' ' ) {
@@ -112,7 +112,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,int dir =CTINFO2DIR (ctinfo);struct nf_conntrack_expect *exp;struct nf_conntrack_tuple *tuple; -u_int32_t dcc_ip; +__be32 dcc_ip;u_int16_t dcc_port;__be16 port;int i, ret =NF_ACCEPT ;
@@ -177,13 +177,14 @@ static int help(struct sk_buff *skb, unsigned int protoff,pr_debug ("unable to parse dcc command\n" );continue ; } -pr_debug ("DCC bound ip/port: %u.%u.%u.%u:%u\n" , -HIPQUAD (dcc_ip), dcc_port); + +pr_debug ("DCC bound ip/port: %pI4:%u\n" , + &dcc_ip, dcc_port);/* dcc_ip can be the internal OR external (NAT'ed) IP */ tuple = &ct->tuplehash[dir].tuple; -if (tuple->src.u3.ip !=htonl (dcc_ip) && - tuple->dst.u3.ip !=htonl (dcc_ip)) { +if (tuple->src.u3.ip != dcc_ip && + tuple->dst.u3.ip != dcc_ip) {if (net_ratelimit ()) printk(KERN_WARNING "Forged DCC command from %pI4: %pI4:%u\n",
Signature · 1 line
1.6.2.1.507.g0e68d
From: Harvey Harrison <[email protected]>
Date: Sat, 28 Mar 2009 18:38:30 -0700
Quoted 10 lines
dcc_ipis treated as a host-endian value in the first printk, but the second printk uses %pI4 which expects a be32. This will cause a mismatch between the debug statement and the warning statement.Treat as a be32 throughout and avoid some byteswapping during some comparisions, and allow another user of HIPQUAD to bite the dust.
Signed-off-by Harvey Harrison <[email protected]>
Applied.
net/netfilter/nf_conntrack_irc.c static int help(struct sk_buff *skb, unsigned int protoff, · line 180
Quoted 1 line
net/netfilter/nf_conntrack_irc.c +1
-0+
^^^^^^
net/netfilter/nf_conntrack_irc.c static int help(struct sk_buff *skb, unsigned int protoff, · line 182
Quoted 2 lines
net/netfilter/nf_conntrack_irc.c +2
-0+pr_debug ("DCC bound ip/port: %pI4:%u\n" , + &dcc_ip, dcc_port);
Trailing whitespace.