diff mbox

libahci: Fix bug in storing EM messages

Message ID 1276242252.14959.8.camel@zm-desktop
State Not Applicable
Delegated to: David Miller
Headers show

Commit Message

Harry Zhang June 11, 2010, 7:44 a.m. UTC 
In function ahci_store_em_buffer(), if the input (signed char*) buffer
contains negative data, the constructed 32-bit long message data may
be wrong.

Signed-off-by: Harry Zhang <harry.zhang@amd.com>
---
 drivers/ata/libahci.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 1984a6e..09a9b51 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -324,7 +324,7 @@  static ssize_t ahci_store_em_buffer(struct device *dev,
 	struct ahci_host_priv *hpriv = ap->host->private_data;
 	void __iomem *mmio = hpriv->mmio;
 	void __iomem *em_mmio = mmio + hpriv->em_loc;
-	u32 em_ctl, msg;
+	u32 em_ctl, *msg_buf = (u32 *)buf;
 	unsigned long flags;
 	int i;
 
@@ -342,11 +342,8 @@  static ssize_t ahci_store_em_buffer(struct device *dev,
 		return -EBUSY;
 	}
 
-	for (i = 0; i < size; i += 4) {
-		msg = buf[i] | buf[i + 1] << 8 |
-		      buf[i + 2] << 16 | buf[i + 3] << 24;
-		writel(msg, em_mmio + i);
-	}
+	for (i = 0; i < size; i += 4)
+		writel(msg_buf[i >> 2], em_mmio + i);
 
 	writel(em_ctl | EM_CTL_TM, mmio + HOST_EM_CTL);