The following commit has been merged in the linux branch: commit e9024a059f2c17fb2bfab212ee9d31511d7b8e57 Author: David Woodhouse dwmw2@infradead.org Date: Fri Oct 30 17:45:14 2009 +0000
libertas if_usb: Fix crash on 64-bit machines
On a 64-bit kernel, skb->tail is an offset, not a pointer. The libertas usb driver passes it to usb_fill_bulk_urb() anyway, causing interesting crashes. Fix that by using skb->data instead.
This highlights a problem with usb_fill_bulk_urb(). It doesn't notice when dma_map_single() fails and return the error to its caller as it should. In fact it _can't_ currently return the error, since it returns void.
So this problem was showing up only at unmap time, after we'd already suffered memory corruption by doing DMA to a bogus address.
Signed-off-by: David Woodhouse David.Woodhouse@intel.com Cc: stable@kernel.org Acked-by: David S. Miller davem@davemloft.net Signed-off-by: John W. Linville linville@tuxdriver.com
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 92bc8c5..3fac4ef 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -508,7 +508,7 @@ static int __if_usb_submit_rx_urb(struct if_usb_card *cardp, /* Fill the receive configuration URB and initialise the Rx call back */ usb_fill_bulk_urb(cardp->rx_urb, cardp->udev, usb_rcvbulkpipe(cardp->udev, cardp->ep_in), - (void *) (skb->tail + (size_t) IPFIELD_ALIGN_OFFSET), + skb->data + IPFIELD_ALIGN_OFFSET, MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, callbackfn, cardp);