adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EBTABLES]: Fix thinkos in ebt_log.c

Browse source 
When converting over the skb_header_pointer(), I converted parts of
this module incorrectly.  Kill the 'u' union in ebt_log() and all the
bogus references to it.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2005-06-28 12:39:40 -07:00
parent 61998bcb4b
commit 85c1937b26
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/bridge/netfilter/ebt_log.c
View file

@ -61,8 +61,6 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,
{ {
struct ebt_log_info *info = (struct ebt_log_info *)data; struct ebt_log_info *info = (struct ebt_log_info *)data;
char level_string[4] = "< >"; char level_string[4] = "< >";
union {struct iphdr iph; struct tcpudphdr ports;
struct arphdr arph; struct arppayload arpp;} u;
level_string[1] = '0' + info->loglevel; level_string[1] = '0' + info->loglevel;
spin_lock_bh(&ebt_log_lock); spin_lock_bh(&ebt_log_lock);
@ -88,7 +86,7 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,
} }
printk(" IP SRC=%u.%u.%u.%u IP DST=%u.%u.%u.%u,", printk(" IP SRC=%u.%u.%u.%u IP DST=%u.%u.%u.%u,",
NIPQUAD(ih->saddr), NIPQUAD(ih->daddr)); NIPQUAD(ih->saddr), NIPQUAD(ih->daddr));
printk(" IP tos=0x%02X, IP proto=%d", u.iph.tos, printk(" IP tos=0x%02X, IP proto=%d", ih->tos,
ih->protocol); ih->protocol);
if (ih->protocol == IPPROTO_TCP || if (ih->protocol == IPPROTO_TCP ||
ih->protocol == IPPROTO_UDP) { ih->protocol == IPPROTO_UDP) {
@ -127,7 +125,7 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,
ah->ar_pln == sizeof(uint32_t)) { ah->ar_pln == sizeof(uint32_t)) {
struct arppayload _arpp, *ap; struct arppayload _arpp, *ap;
ap = skb_header_pointer(skb, sizeof(u.arph), ap = skb_header_pointer(skb, sizeof(_arph),
sizeof(_arpp), &_arpp); sizeof(_arpp), &_arpp);
if (ap == NULL) { if (ap == NULL) {
printk(" INCOMPLETE ARP payload"); printk(" INCOMPLETE ARP payload");