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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 98C0BC07E99 for ; Mon, 12 Jul 2021 09:07:07 +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 227F161026 for ; Mon, 12 Jul 2021 09:07:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 227F161026 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]:51330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2ru6-0001nf-2W for qemu-devel@archiver.kernel.org; Mon, 12 Jul 2021 05:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2rt4-00010O-AG for qemu-devel@nongnu.org; Mon, 12 Jul 2021 05:06:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:50989) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2rt1-0000pa-3q for qemu-devel@nongnu.org; Mon, 12 Jul 2021 05:06:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626080756; 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=r/ZEfTorHA5r7flRasf3d7SqRXeiMOW9I0XbSAf/aWE=; b=RZUfww50/T+b3AOmO8261kn78H75yEVz1MLL2+6B8QV8UgwX/k4VBT59k81RBtl44TZhIz rQ2BxZoA8MQk6pQbtkz6butYl/CiDSbRWEtWXzm5PzYe+9+709qSnupXYmN+9CuMAnV0eY yrrpVfQ+5uNxrCLrsPGoJOHkYROBmos= 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-418-qnO4sFF_PuCq3zQpvQJ6HQ-1; Mon, 12 Jul 2021 05:05:53 -0400 X-MC-Unique: qnO4sFF_PuCq3zQpvQJ6HQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 29B99192376D; Mon, 12 Jul 2021 09:05:52 +0000 (UTC) Received: from localhost (unknown [10.43.2.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68CAF60BD8; Mon, 12 Jul 2021 09:05:49 +0000 (UTC) Date: Mon, 12 Jul 2021 11:05:48 +0200 From: Igor Mammedov To: David Hildenbrand Subject: Re: [PATCH v1] vfio: Fix CID 1458134 in vfio_register_ram_discard_listener() Message-ID: <20210712110548.02f3bc18@redhat.com> In-Reply-To: <20210712083135.15755-1-david@redhat.com> References: <20210712083135.15755-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Pankaj Gupta , Eduardo Habkost , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Peter Xu , "Dr . David Alan Gilbert" , Auger Eric , Alex Williamson , teawater , Paolo Bonzini , Marek Kedzierski , Wei Yang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 12 Jul 2021 10:31:35 +0200 David Hildenbrand wrote: > CID 1458134: Integer handling issues (BAD_SHIFT) > In expression "1 << ctz64(container->pgsizes)", left shifting by more > than 31 bits has undefined behavior. The shift amount, > "ctz64(container->pgsizes)", is 64. > > Commit 5e3b981c330c ("vfio: Support for RamDiscardManager in the !vIOMMU > case") added an assertion that our granularity is at least as big as the > page size. > > Although unlikely, we could have a page size that does not fit into > 32 bit. In that case, we'd try shifting by more than 31 bit. > > Let's use 1ULL instead and make sure we're not shifting by more than 63 > bit by asserting that any bit in container->pgsizes is set. > > Fixes: CID 1458134 > Cc: Alex Williamson > Cc: Eduardo Habkost > Cc: "Michael S. Tsirkin" > Cc: Paolo Bonzini > Cc: Dr. David Alan Gilbert > Cc: Igor Mammedov > Cc: Pankaj Gupta > Cc: Peter Xu > Cc: Auger Eric > Cc: Wei Yang > Cc: teawater > Cc: Marek Kedzierski > Signed-off-by: David Hildenbrand Reviewed-by: Igor Mammedov > --- > hw/vfio/common.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 3f0d111360..8728d4d5c2 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -783,7 +783,8 @@ static void vfio_register_ram_discard_listener(VFIOContainer *container, > section->mr); > > g_assert(vrdl->granularity && is_power_of_2(vrdl->granularity)); > - g_assert(vrdl->granularity >= 1 << ctz64(container->pgsizes)); > + g_assert(container->pgsizes && > + vrdl->granularity >= 1ULL << ctz64(container->pgsizes)); > > ram_discard_listener_init(&vrdl->listener, > vfio_ram_discard_notify_populate,