From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2548FC433E0 for ; Mon, 8 Mar 2021 19:55:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9126861481 for ; Mon, 8 Mar 2021 19:55:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9126861481 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJLyj-0008EW-Bg for qemu-devel@archiver.kernel.org; Mon, 08 Mar 2021 14:55:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJLxS-0007fT-Iu for qemu-devel@nongnu.org; Mon, 08 Mar 2021 14:54:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:27812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lJLxQ-0000Q3-04 for qemu-devel@nongnu.org; Mon, 08 Mar 2021 14:54:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615233262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ASTDmUrSarcUjSRqZocuSlpOrdMvKtSIRX5bZsoXwK4=; b=KyZwLjwWsAX+0Grwv4pEbghRMGmB3nR2TrEwapzwix0iFrdA6nFXzdy80iFcJjv+UggOpd LAsxaofGOsRpzTXJeTwz6hTdllcK0GjxpZIaAQrpNvpcng/qp/3aVL1OuDutrnXdoHqg9I eLwJMN7nVp0Y52K+18eEz27GsXH7BOo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-174-dHIdYokbP9C-U8_xDfCuqw-1; Mon, 08 Mar 2021 14:54:19 -0500 X-MC-Unique: dHIdYokbP9C-U8_xDfCuqw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1CC41801814; Mon, 8 Mar 2021 19:54:18 +0000 (UTC) Received: from [10.3.112.36] (ovpn-112-36.phx2.redhat.com [10.3.112.36]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 837965C266; Mon, 8 Mar 2021 19:54:17 +0000 (UTC) Subject: Re: [PATCH] scsi: Silence gcc warning To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org, Li Qiang , Alexander Bulekov , "qemu-trivial@nongnu.org" References: <20210209152350.207958-1-eblake@redhat.com> <2ca3b005-9d9f-dde6-a7d4-b7e08a3e3066@redhat.com> From: Eric Blake Organization: Red Hat, Inc. Message-ID: <01bc8d3d-5399-dfad-0ca3-c9392fcb176c@redhat.com> Date: Mon, 8 Mar 2021 13:54:16 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <2ca3b005-9d9f-dde6-a7d4-b7e08a3e3066@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Adding qemu-trivial in cc. On 2/9/21 9:44 AM, Philippe Mathieu-Daudé wrote: > On 2/9/21 4:23 PM, Eric Blake wrote: >> On Fedora 33, gcc 10.2.1 notes that scsi_cdb_length(buf) can set >> len==-1, which in turn overflows g_malloc(): >> >> [5/5] Linking target qemu-system-x86_64 >> In function ‘scsi_disk_new_request_dump’, >> inlined from ‘scsi_new_request’ at ../hw/scsi/scsi-disk.c:2608:9: >> ../hw/scsi/scsi-disk.c:2582:19: warning: argument 1 value ‘18446744073709551612’ exceeds maximum object size 9223372036854775807 [-Walloc-size-larger-than=] >> 2582 | line_buffer = g_malloc(len * 5 + 1); >> | ^ >> >> Silence it with a decent assertion, since we only convert a buffer to >> bytes when we have a valid cdb length. >> >> Signed-off-by: Eric Blake >> --- >> hw/scsi/scsi-disk.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c >> index ed52fcd49ff0..b3311a5657b7 100644 >> --- a/hw/scsi/scsi-disk.c >> +++ b/hw/scsi/scsi-disk.c >> @@ -2579,6 +2579,7 @@ static void scsi_disk_new_request_dump(uint32_t lun, uint32_t tag, uint8_t *buf) >> int len = scsi_cdb_length(buf); >> char *line_buffer, *p; >> >> + assert(len > 0 && len <= 16); >> line_buffer = g_malloc(len * 5 + 1); >> >> for (i = 0, p = line_buffer; i < len; i++) { >> > > Reviewed-by: Philippe Mathieu-Daudé > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org