From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NqPNs-0002yn-P1
	for qemu-devel@nongnu.org; Sat, 13 Mar 2010 06:19:56 -0500
Received: from [199.232.76.173] (port=52994 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NqPNr-0002xQ-9h
	for qemu-devel@nongnu.org; Sat, 13 Mar 2010 06:19:55 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <aurelien@aurel32.net>) id 1NqPNq-0001Ge-0j
	for qemu-devel@nongnu.org; Sat, 13 Mar 2010 06:19:55 -0500
Received: from hall.aurel32.net ([88.191.82.174]:54737)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <aurelien@aurel32.net>)
	id 1NqPNp-0001GU-JU
	for qemu-devel@nongnu.org; Sat, 13 Mar 2010 06:19:53 -0500
Date: Sat, 13 Mar 2010 12:19:51 +0100
From: Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] [PATCH] scsi-disk: fix buffer overflow
Message-ID: <20100313111951.GB26705@volta.aurel32.net>
References: <1268239637-24524-1-git-send-email-kraxel@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
In-Reply-To: <1268239637-24524-1-git-send-email-kraxel@redhat.com>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org

On Wed, Mar 10, 2010 at 05:47:17PM +0100, Gerd Hoffmann wrote:
> In case s->version is shorter than 4 bytes we overflow the memcpy src
> buffer.  Fix it by clearing the target buffer, then copy only the
> amount of bytes we actually have.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/scsi-disk.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
> index b2f61fe..5792545 100644
> --- a/hw/scsi-disk.c
> +++ b/hw/scsi-disk.c
> @@ -459,7 +459,9 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf)
>          memcpy(&outbuf[16], "QEMU HARDDISK   ", 16);
>      }
>      memcpy(&outbuf[8], "QEMU    ", 8);
> -    memcpy(&outbuf[32], s->version ? s->version : QEMU_VERSION, 4);
> +    memset(&outbuf[32], 0, 4);
> +    memcpy(&outbuf[32], s->version ? s->version : QEMU_VERSION,
> +           MIN(4, strlen(s->version ? s->version : QEMU_VERSION)));

Wouldn't be simpler to use strncpy() instead of a memcpy()?

>      /* Identify device as SCSI-3 rev 1.
>         Some later commands are also implemented. */
>      outbuf[2] = 5;
> -- 
> 1.6.6.1
> 
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net