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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,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 27BECC433E0 for ; Tue, 4 Aug 2020 06:02:50 +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 1CEA82073E for ; Tue, 4 Aug 2020 06:02:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WZtME806" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CEA82073E 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]:45138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2q2D-0005OT-6M for qemu-devel@archiver.kernel.org; Tue, 04 Aug 2020 02:02:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2q0v-0004Wv-3A for qemu-devel@nongnu.org; Tue, 04 Aug 2020 02:01:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39761 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k2q0s-0008EN-1h for qemu-devel@nongnu.org; Tue, 04 Aug 2020 02:01:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596520883; 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=dwyC7fjDctzb9JjaBEiChi2kibtLRahUtk/usrwo++I=; b=WZtME806rYny7NeMEvxK+6od3RqkNnuouyZEcbc1LYQguulrRB6lmzkDiE49jk0ngeSqps fn5yfNBptNQx6Yev1k61FiM3qVuZPdufj0GCejQwlATOp6M2u7dNOmqM/pkjCGM9F7VhA8 AFz922gYMjVnKr6l6HqHlqW8xOoAE3o= 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-155-i67H1YUdON6fN1WQeEcFYQ-1; Tue, 04 Aug 2020 02:01:17 -0400 X-MC-Unique: i67H1YUdON6fN1WQeEcFYQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0173179EC1; Tue, 4 Aug 2020 06:01:16 +0000 (UTC) Received: from [10.72.13.197] (ovpn-13-197.pek2.redhat.com [10.72.13.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EEF790E8B; Tue, 4 Aug 2020 06:01:12 +0000 (UTC) Subject: Re: [PATCH v2] hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() To: Mauro Matteo Cascella , qemu-devel@nongnu.org References: <20200801164238.1610609-1-mcascell@redhat.com> From: Jason Wang Message-ID: <22b6e239-11d5-7532-ae38-29ecf5ccfa23@redhat.com> Date: Tue, 4 Aug 2020 14:01:11 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200801164238.1610609-1-mcascell@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=207.211.31.120; envelope-from=jasowang@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/04 01:28:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: alxndr@bu.edu, dmitry.fleytman@gmail.com, ezrakiez@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2020/8/2 上午12:42, Mauro Matteo Cascella wrote: > An assertion failure issue was found in the code that processes network packets > while adding data fragments into the packet context. It could be abused by a > malicious guest to abort the QEMU process on the host. This patch replaces the > affected assert() with a conditional statement, returning false if the current > data fragment exceeds max_raw_frags. > > Reported-by: Alexander Bulekov > Reported-by: Ziming Zhang > Signed-off-by: Mauro Matteo Cascella > --- > hw/net/net_tx_pkt.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c > index 9560e4a49e..da262edc3e 100644 > --- a/hw/net/net_tx_pkt.c > +++ b/hw/net/net_tx_pkt.c > @@ -379,7 +379,10 @@ bool net_tx_pkt_add_raw_fragment(struct NetTxPkt *pkt, hwaddr pa, > hwaddr mapped_len = 0; > struct iovec *ventry; > assert(pkt); > - assert(pkt->max_raw_frags > pkt->raw_frags); > + > + if (pkt->raw_frags >= pkt->max_raw_frags) { > + return false; > + } > > if (!len) { > return true; Applied. Thanks