diff options
author | Stanislav Brabec <sbrabec@suse.cz> | 2009-12-08 21:00:22 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-18 14:05:08 -0800 |
commit | 599343ebd4b057e35955915d73410ea0b987875a (patch) | |
tree | fbfdfae0d9c0ef3c293c197c80e508cab8eadc4f /drivers/net | |
parent | 42d8bd7737a65b535d3247392b11fcd0f32303fe (diff) |
b44 WOL setup: one-bit-off stack corruption kernel panic fix
[ Upstream commit: e0188829cb724e7d12a2d4e343b368ff1d6e1471 ]
About 50% of shutdowns of b44 Ethernet adapter ends by kernel panic
with kernels compiled with stack-protector.
Checking b44_magic_pattern() return values, one call of
b44_magic_pattern() returns 127. It means, that set_bit(128, pmask)
was called on line 1509. It means that bit 0 of 17th byte of pmask was
overwritten. But pmask has only 16 bytes. Stack corruption happens.
It seems that set_bit() on line 1509 always writes one bit off.
The fix does not only solve the stack corruption, but also makes Wake
On LAN working on my onboard B44 on Asus A7V-333X mainboard.
It seems that this problem affects all kernel versions since commit
725ad800 ([PATCH] b44: add wol for old nic) on 2006-06-20.
Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/b44.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 2a9132343b6..4869adb6958 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -1505,8 +1505,7 @@ static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset) for (k = 0; k< ethaddr_bytes; k++) { ppattern[offset + magicsync + (j * ETH_ALEN) + k] = macaddr[k]; - len++; - set_bit(len, (unsigned long *) pmask); + set_bit(len++, (unsigned long *) pmask); } } return len - 1; |