Bluetooth: Fix incorrect alignment in Marvell BT-over-SDIO driver
The driver uses "u32" for alignment check and calculation which works only on 32-bit system. It will crash the 64-bit system. Replace "u32" with "unsigned long" to fix this issue. Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
9374253ffe
commit
3318b2362b
|
@ -481,12 +481,14 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((u32) skb->data & (BTSDIO_DMA_ALIGN - 1)) {
|
if ((unsigned long) skb->data & (BTSDIO_DMA_ALIGN - 1)) {
|
||||||
skb_put(skb, (u32) skb->data & (BTSDIO_DMA_ALIGN - 1));
|
skb_put(skb, (unsigned long) skb->data &
|
||||||
skb_pull(skb, (u32) skb->data & (BTSDIO_DMA_ALIGN - 1));
|
(BTSDIO_DMA_ALIGN - 1));
|
||||||
|
skb_pull(skb, (unsigned long) skb->data &
|
||||||
|
(BTSDIO_DMA_ALIGN - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
payload = skb->tail;
|
payload = skb->data;
|
||||||
|
|
||||||
ret = sdio_readsb(card->func, payload, card->ioport,
|
ret = sdio_readsb(card->func, payload, card->ioport,
|
||||||
buf_block_len * blksz);
|
buf_block_len * blksz);
|
||||||
|
@ -773,7 +775,7 @@ static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv,
|
||||||
}
|
}
|
||||||
|
|
||||||
buf = payload;
|
buf = payload;
|
||||||
if ((u32) payload & (BTSDIO_DMA_ALIGN - 1)) {
|
if ((unsigned long) payload & (BTSDIO_DMA_ALIGN - 1)) {
|
||||||
tmpbufsz = ALIGN_SZ(nb, BTSDIO_DMA_ALIGN);
|
tmpbufsz = ALIGN_SZ(nb, BTSDIO_DMA_ALIGN);
|
||||||
tmpbuf = kmalloc(tmpbufsz, GFP_KERNEL);
|
tmpbuf = kmalloc(tmpbufsz, GFP_KERNEL);
|
||||||
memset(tmpbuf, 0, tmpbufsz);
|
memset(tmpbuf, 0, tmpbufsz);
|
||||||
|
|
|
@ -104,4 +104,5 @@ struct btmrvl_sdio_device {
|
||||||
|
|
||||||
/* Macros for Data Alignment : address */
|
/* Macros for Data Alignment : address */
|
||||||
#define ALIGN_ADDR(p, a) \
|
#define ALIGN_ADDR(p, a) \
|
||||||
((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1))
|
((((unsigned long)(p)) + (((unsigned long)(a)) - 1)) & \
|
||||||
|
~(((unsigned long)(a)) - 1))
|
||||||
|
|
Loading…
Reference in New Issue