From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R22Mq-0008Kt-Q6 for qemu-devel@nongnu.org; Fri, 09 Sep 2011 10:47:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R22Mp-0004qg-EO for qemu-devel@nongnu.org; Fri, 09 Sep 2011 10:47:44 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:47525) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R22Mp-0004qX-3a for qemu-devel@nongnu.org; Fri, 09 Sep 2011 10:47:43 -0400 Received: by vxj15 with SMTP id 15so849328vxj.4 for ; Fri, 09 Sep 2011 07:47:42 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 9 Sep 2011 16:47:26 +0200 Message-Id: <1315579646-6874-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] scsi: fix sign extension problems List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org When assigning a 32-bit value to cmd->xfer (which is 64-bits) it can be erroneously sign extended because the intermediate 32-bit computation is signed. Fix this by standardizing on the ld*_be_p functions. Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 96d6305..731d3b9 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -546,15 +546,15 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf) break; case 1: case 2: - cmd->xfer = buf[8] | (buf[7] << 8); + cmd->xfer = lduw_be_p(&buf[7]); cmd->len = 10; break; case 4: - cmd->xfer = buf[13] | (buf[12] << 8) | (buf[11] << 16) | (buf[10] << 24); + cmd->xfer = ldl_be_p(&buf[10]); cmd->len = 16; break; case 5: - cmd->xfer = buf[9] | (buf[8] << 8) | (buf[7] << 16) | (buf[6] << 24); + cmd->xfer = ldl_be_p(&buf[6]); cmd->len = 12; break; default: @@ -714,23 +714,15 @@ static uint64_t scsi_cmd_lba(SCSICommand *cmd) switch (buf[0] >> 5) { case 0: - lba = (uint64_t) buf[3] | ((uint64_t) buf[2] << 8) | - (((uint64_t) buf[1] & 0x1f) << 16); + lba = ldl_be_p(&buf[0]) & 0x1fffff; break; case 1: case 2: - lba = (uint64_t) buf[5] | ((uint64_t) buf[4] << 8) | - ((uint64_t) buf[3] << 16) | ((uint64_t) buf[2] << 24); + case 5: + lba = ldl_be_p(&buf[2]); break; case 4: - lba = (uint64_t) buf[9] | ((uint64_t) buf[8] << 8) | - ((uint64_t) buf[7] << 16) | ((uint64_t) buf[6] << 24) | - ((uint64_t) buf[5] << 32) | ((uint64_t) buf[4] << 40) | - ((uint64_t) buf[3] << 48) | ((uint64_t) buf[2] << 56); - break; - case 5: - lba = (uint64_t) buf[5] | ((uint64_t) buf[4] << 8) | - ((uint64_t) buf[3] << 16) | ((uint64_t) buf[2] << 24); + lba = ldq_be_p(&buf[2]); break; default: lba = -1; -- 1.7.6