From nobody Fri Apr 19 22:40:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596300280; cv=none; d=zohomail.com; s=zohoarc; b=g1nfrEH9scerkSj3oB2qjL9tLinZMvGmj9NaEXJngGHZF5dCKTDANcgs0N8IMEHf7UW+i8HVuoqjVxqbq5RD/yZuPVH4S7zdedgc7bTnBitU5X60WppDv05LHBTiGBi+aO1vWkYgJtIu9eSBboxFvmdxOhJ20AUBUt3JoMi5gkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596300280; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=5BoWYvtPdezRowK9Kp3e+rj5uNLb5jnD/VYxkiXhSUI=; b=BFbszPtyFxJrwOlmShRdMmJTQbwHQK2VBnQAjkK33H7+XUXrx9EvdLoSa1cjn8LGSUxbqCAZjoJxQsDQo3LDEnbnCZDt2WCWm+nNdlo67lTr1nCmo7RRClAwvQyM4/So74++wrEVrsUQhUToYiEho4vflWYQX1WyEVVUjEAN2Tc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596300280375262.762924217589; Sat, 1 Aug 2020 09:44:40 -0700 (PDT) Received: from localhost ([::1]:58020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1ucg-0001pT-Rk for importer@patchew.org; Sat, 01 Aug 2020 12:44:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1ubt-0000w3-5R for qemu-devel@nongnu.org; Sat, 01 Aug 2020 12:43:49 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:27255 helo=us-smtp-delivery-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 1k1ubq-0004RN-B6 for qemu-devel@nongnu.org; Sat, 01 Aug 2020 12:43:48 -0400 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-141-QfQG3u8xO32dozaAEKWR0Q-1; Sat, 01 Aug 2020 12:43:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5DA4C107ACCA; Sat, 1 Aug 2020 16:43:15 +0000 (UTC) Received: from f32-work.redhat.com (unknown [10.40.192.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C0E205DA75; Sat, 1 Aug 2020 16:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596300198; 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; bh=5BoWYvtPdezRowK9Kp3e+rj5uNLb5jnD/VYxkiXhSUI=; b=TVCdx33esThFK+TOd4PWciycKknCN7MlvyT+vmOEVYruZrLrAMg/m/zJyMBGAh+hLcMIsm rt6USAsDPH2tRdhUASev0QkkBHcCiK4Lw7iVOOH/OeQFdqNMKCF8QKTNetVm/vnCltuz6t zhgyhxBJRpeXalrcFapz/FHTmAUeUuk= X-MC-Unique: QfQG3u8xO32dozaAEKWR0Q-1 From: Mauro Matteo Cascella To: qemu-devel@nongnu.org Subject: [PATCH v2] hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() Date: Sat, 1 Aug 2020 18:42:38 +0200 Message-Id: <20200801164238.1610609-1-mcascell@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=mcascell@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/01 12:43:18 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, 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, jasowang@redhat.com, dmitry.fleytman@gmail.com, mcascell@redhat.com, ezrakiez@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" An assertion failure issue was found in the code that processes network pac= kets 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 curr= ent data fragment exceeds max_raw_frags. Reported-by: Alexander Bulekov Reported-by: Ziming Zhang Signed-off-by: Mauro Matteo Cascella Reviewed-by: Dmitry Fleytman --- 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 =3D 0; struct iovec *ventry; assert(pkt); - assert(pkt->max_raw_frags > pkt->raw_frags); + + if (pkt->raw_frags >=3D pkt->max_raw_frags) { + return false; + } =20 if (!len) { return true; --=20 2.26.2