Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
+2
-4
net/bridge/netfilter/ebt_log.c
+2
-4
net/bridge/netfilter/ebt_log.c
···
61
{
62
struct ebt_log_info *info = (struct ebt_log_info *)data;
63
char level_string[4] = "< >";
64
-
union {struct iphdr iph; struct tcpudphdr ports;
65
-
struct arphdr arph; struct arppayload arpp;} u;
66
67
level_string[1] = '0' + info->loglevel;
68
spin_lock_bh(&ebt_log_lock);
···
86
}
87
printk(" IP SRC=%u.%u.%u.%u IP DST=%u.%u.%u.%u,",
88
NIPQUAD(ih->saddr), NIPQUAD(ih->daddr));
89
-
printk(" IP tos=0x%02X, IP proto=%d", u.iph.tos,
90
ih->protocol);
91
if (ih->protocol == IPPROTO_TCP ||
92
ih->protocol == IPPROTO_UDP) {
···
125
ah->ar_pln == sizeof(uint32_t)) {
126
struct arppayload _arpp, *ap;
127
128
-
ap = skb_header_pointer(skb, sizeof(u.arph),
129
sizeof(_arpp), &_arpp);
130
if (ap == NULL) {
131
printk(" INCOMPLETE ARP payload");
···
61
{
62
struct ebt_log_info *info = (struct ebt_log_info *)data;
63
char level_string[4] = "< >";
64
65
level_string[1] = '0' + info->loglevel;
66
spin_lock_bh(&ebt_log_lock);
···
88
}
89
printk(" IP SRC=%u.%u.%u.%u IP DST=%u.%u.%u.%u,",
90
NIPQUAD(ih->saddr), NIPQUAD(ih->daddr));
91
+
printk(" IP tos=0x%02X, IP proto=%d", ih->tos,
92
ih->protocol);
93
if (ih->protocol == IPPROTO_TCP ||
94
ih->protocol == IPPROTO_UDP) {
···
127
ah->ar_pln == sizeof(uint32_t)) {
128
struct arppayload _arpp, *ap;
129
130
+
ap = skb_header_pointer(skb, sizeof(_arph),
131
sizeof(_arpp), &_arpp);
132
if (ap == NULL) {
133
printk(" INCOMPLETE ARP payload");