[EBTABLES]: Fix thinkos in ebt_log.c
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:
Родитель
61998bcb4b
Коммит
85c1937b26
|
@ -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;
|
||||
char level_string[4] = "< >";
|
||||
union {struct iphdr iph; struct tcpudphdr ports;
|
||||
struct arphdr arph; struct arppayload arpp;} u;
|
||||
|
||||
level_string[1] = '0' + info->loglevel;
|
||||
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,",
|
||||
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);
|
||||
if (ih->protocol == IPPROTO_TCP ||
|
||||
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)) {
|
||||
struct arppayload _arpp, *ap;
|
||||
|
||||
ap = skb_header_pointer(skb, sizeof(u.arph),
|
||||
ap = skb_header_pointer(skb, sizeof(_arph),
|
||||
sizeof(_arpp), &_arpp);
|
||||
if (ap == NULL) {
|
||||
printk(" INCOMPLETE ARP payload");
|
||||
|
|
Загрузка…
Ссылка в новой задаче