Skip to contentSkip to conversation

Bluetooth: Fix incorrect alignment in Marvell BT-over-SDIO driver

PATCH In review Bing Zhao 2 participants 5 messages Jul 8, 2009 – Jul 14, 2009 Bluetooth drivers

lore
Share & tools
lore

Bing Zhao

author
#0 lore raw

PATCH 1/1 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.

---
This patch is for bluetooth-mrvl-2.6.git tree. It has been tested on both 32-bit and 64-bit x86 laptops.

 drivers/bluetooth/btmrvl_sdio.c |   12 +++++++-----
 drivers/bluetooth/btmrvl_sdio.h |    3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)
drivers/bluetooth/btmrvl_sdio.c +7 -5
index 224af53..1cfa8b4 100644
@@ -481,12 +481,14 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
 		goto exit;
 	}
 
-	if ((u32) skb->data & (BTSDIO_DMA_ALIGN - 1)) {
-		skb_put(skb, (u32) skb->data & (BTSDIO_DMA_ALIGN - 1));
-		skb_pull(skb, (u32) skb->data & (BTSDIO_DMA_ALIGN - 1));
+	if ((unsigned long) skb->data & (BTSDIO_DMA_ALIGN - 1)) {
+		skb_put(skb, (unsigned long) skb->data &
+					(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,
 			  buf_block_len * blksz);
@@ -773,7 +775,7 @@ static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv,
 	}
 
 	buf = payload;
-	if ((u32) payload & (BTSDIO_DMA_ALIGN - 1)) {
+	if ((unsigned long) payload & (BTSDIO_DMA_ALIGN - 1)) {
 		tmpbufsz = ALIGN_SZ(nb, BTSDIO_DMA_ALIGN);
 		tmpbuf = kmalloc(tmpbufsz, GFP_KERNEL);
 		memset(tmpbuf, 0, tmpbufsz);
drivers/bluetooth/btmrvl_sdio.h +2 -1
index 2dd284e..27329f1 100644
@@ -104,4 +104,5 @@ struct btmrvl_sdio_device {
 
 /* Macros for Data Alignment : address */
 #define ALIGN_ADDR(p, a)	\
-	((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1))
+	((((unsigned long)(p)) + (((unsigned long)(a)) - 1)) & \
+					~(((unsigned long)(a)) - 1))
Signature · 1 line
1.5.3.6
maintainer
#1 lore raw

Hi Bing,

Quoted 3 lines

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.

I pushed that patch into the bluetooth-mrvl-2.6 tree now.

However I am pretty sure that are better "Linux" ways on handling the alignment for the SKBs.

Regards

Marcel

author
#2 lore raw

Hi Marcel,

This patch fixed the alignment issue and the compilation warnings on 64-bit=
system.
I also tested some basic commands (scan, l2ping, etc.) on my 64-bit HP lapt= op and they seem working fine.

Should you have any other commands for testing/verification, or items for c= leanup please let me know.

Thanks much for your help.

Bing

Quoted 6 lines

-----Original Message-----
From: Marcel Holtmann [mailto:[email protected]]
Sent: Wednesday, July 08, 2009 11:54 AM
To: Bing Zhao
Cc: [email protected]
Subject: Re: [PATCH] Bluetooth: Fix incorrect alignment in Marvell BT-ove=

r-SDIO driver

Quoted 16 lines

=20
Hi Bing,
=20

Quoted 3 lines

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.

=20
I pushed that patch into the bluetooth-mrvl-2.6 tree now. =20
However I am pretty sure that are better "Linux" ways on handling the alignment for the SKBs.
=20
Regards
=20
Marcel
=20

maintainer
#3 lore raw

Hi Bing,

not top-posting please. This is an open source mailing list. We do things the right way.

Quoted 4 lines

This patch fixed the alignment issue and the compilation warnings on 64-bit system.
I also tested some basic commands (scan, l2ping, etc.) on my 64-bit HP laptop and they seem working fine.

Should you have any other commands for testing/verification, or items for cleanup please let me know.

I pushed bluetooth-mrvl-2.6 into bluetooth-next-2.6 to see if any build fallouts come up.

Regards

Marcel

author
#4 lore raw

Hi Marcel,

Quoted 6 lines

-----Original Message-----
From: Marcel Holtmann [mailto:[email protected]]
Sent: Monday, July 13, 2009 7:27 PM
To: Bing Zhao
Cc: [email protected]
Subject: RE: [PATCH] Bluetooth: Fix incorrect alignment in Marvell BT-ove=

r-SDIO driver

Quoted 5 lines

=20
Hi Bing,
=20
not top-posting please. This is an open source mailing list. We do things the right way.

Sorry about that.

Quoted 1 line
Quoted 1 line

This patch fixed the alignment issue and the compilation warnings on 64=

-bit system.

Quoted 1 line
Quoted 1 line

I also tested some basic commands (scan, l2ping, etc.) on my 64-bit HP =

laptop and they seem working

Quoted 3 lines

fine.

Quoted 2 lines

Should you have any other commands for testing/verification, or items f=

or cleanup please let me

Quoted 4 lines

know.
=20
I pushed bluetooth-mrvl-2.6 into bluetooth-next-2.6 to see if any build fallouts come up.

Thanks! I'll clone bluetooth-next-2.6 tree for testing and future changes.

Bing

Quoted 4 lines

Regards
=20
Marcel
=20