lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER] arp_tables: Fix unaligned accesses.

Browse Source 
There are two device string comparison loops in arp_packet_match().
The first one goes byte-by-byte but the second one tries to be
clever and cast the string to a long and compare by longs.

The device name strings in the arp table entries are not guarenteed
to be aligned enough to make this value, so just use byte-by-byte
for both cases.

Based upon a report by <drraid@gmail.com>.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2007-04-13 16:37:54 -07:00
parent 612f09e849
commit 49688c8431
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv4/netfilter/arp_tables.c
View File

@@ -166,13 +166,9 @@ static inline int arp_packet_match(const struct arphdr *arphdr,
return 0; return 0;
} }
for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) { for (i = 0, ret = 0; i < IFNAMSIZ; i++) {
unsigned long odev; ret |= (outdev[i] ^ arpinfo->outiface[i])
memcpy(&odev, outdev + i*sizeof(unsigned long), & arpinfo->outiface_mask[i];
sizeof(unsigned long));
ret |= (odev
^ ((const unsigned long *)arpinfo->outiface)[i])
& ((const unsigned long *)arpinfo->outiface_mask)[i];
} }
if (FWINV(ret != 0, ARPT_INV_VIA_OUT)) { if (FWINV(ret != 0, ARPT_INV_VIA_OUT)) {