mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
[PATCH] 3c59x: bounds checking for hw_checksums
Add bounds checking to usage of hw_checksums module parameter array. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
d9e46de34e
commit
32fb5f06db
1 changed files with 9 additions and 7 deletions
|
@ -1513,9 +1513,10 @@ static int __devinit vortex_probe1(struct device *gendev,
|
|||
dev->hard_start_xmit = boomerang_start_xmit;
|
||||
/* Actually, it still should work with iommu. */
|
||||
dev->features |= NETIF_F_SG;
|
||||
if (((hw_checksums[card_idx] == -1) && (vp->drv_flags & HAS_HWCKSM)) ||
|
||||
(hw_checksums[card_idx] == 1)) {
|
||||
dev->features |= NETIF_F_IP_CSUM;
|
||||
if (card_idx < MAX_UNITS &&
|
||||
((hw_checksums[card_idx] == -1 && (vp->drv_flags & HAS_HWCKSM)) ||
|
||||
hw_checksums[card_idx] == 1)) {
|
||||
dev->features |= NETIF_F_IP_CSUM;
|
||||
}
|
||||
} else {
|
||||
dev->hard_start_xmit = vortex_start_xmit;
|
||||
|
@ -2791,10 +2792,11 @@ vortex_close(struct net_device *dev)
|
|||
}
|
||||
|
||||
#if DO_ZEROCOPY
|
||||
if ( vp->rx_csumhits &&
|
||||
((vp->drv_flags & HAS_HWCKSM) == 0) &&
|
||||
(hw_checksums[vp->card_idx] == -1)) {
|
||||
printk(KERN_WARNING "%s supports hardware checksums, and we're not using them!\n", dev->name);
|
||||
if (vp->rx_csumhits &&
|
||||
(vp->drv_flags & HAS_HWCKSM) == 0 &&
|
||||
(vp->card_idx >= MAX_UNITS || hw_checksums[vp->card_idx] == -1)) {
|
||||
printk(KERN_WARNING "%s supports hardware checksums, and we're "
|
||||
"not using them!\n", dev->name);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue