From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nrwad-0000F1-6B
	for qemu-devel@nongnu.org; Wed, 17 Mar 2010 12:59:27 -0400
Received: from [199.232.76.173] (port=35639 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nrwac-0000EM-J4
	for qemu-devel@nongnu.org; Wed, 17 Mar 2010 12:59:26 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <anthony@codemonkey.ws>) id 1Nrwab-0004ml-0P
	for qemu-devel@nongnu.org; Wed, 17 Mar 2010 12:59:26 -0400
Received: from mail-pz0-f194.google.com ([209.85.222.194]:46425)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1Nrwaa-0004md-Ne
	for qemu-devel@nongnu.org; Wed, 17 Mar 2010 12:59:24 -0400
Received: by pzk32 with SMTP id 32so860028pzk.4
	for <qemu-devel@nongnu.org>; Wed, 17 Mar 2010 09:59:23 -0700 (PDT)
Message-ID: <4BA10A68.2060607@codemonkey.ws>
Date: Wed, 17 Mar 2010 11:59:20 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] scsi-disk: fix buffer overflow
References: <1268239637-24524-1-git-send-email-kraxel@redhat.com>
In-Reply-To: <1268239637-24524-1-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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 03/10/2010 10:47 AM, 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>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   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)));
>       /* Identify device as SCSI-3 rev 1.
>          Some later commands are also implemented. */
>       outbuf[2] = 5;
>