linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Harry Zhang <harry.zhang@amd.com>
To: jgarzik@pobox.com
Cc: linux-ide@vger.kernel.org, tj@kernel.org, shane.huang@amd.com,
	Zhang@domain.invalid, Harry <Harry.Zhang@amd.com>
Subject: libahci: Fix bug in storing EM messages
Date: Fri, 11 Jun 2010 15:44:12 +0800	[thread overview]
Message-ID: <1276242252.14959.8.camel@zm-desktop> (raw)

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 --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);
 
-- 
1.6.4.2




                 reply	other threads:[~2010-06-11  7:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1276242252.14959.8.camel@zm-desktop \
    --to=harry.zhang@amd.com \
    --cc=Zhang@domain.invalid \
    --cc=jgarzik@pobox.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=shane.huang@amd.com \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).