From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BDB646A0A0 for ; Tue, 11 Aug 2020 11:30:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AFEED1B840 for ; Tue, 11 Aug 2020 11:30:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BB02E1B836 for ; Tue, 11 Aug 2020 11:30:45 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8146E44591 for ; Tue, 11 Aug 2020 11:30:45 +0200 (CEST) Date: Tue, 11 Aug 2020 11:30:38 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20200810123222.1221942-1-o.bektas@proxmox.com> In-Reply-To: <20200810123222.1221942-1-o.bektas@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1597138231.mhqlpej142.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, openwall.com] Subject: [pve-devel] applied: [PATCH pve-qemu] patch for possible DOS in qemu network packet processing X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2020 09:30:46 -0000 On August 10, 2020 2:32 pm, Oguz Bektas wrote: > fixes an assertion failure in qemu network packet processing, which can > lead to DOS'ing the qemu process on the host. this affects 'e1000e' and > 'vmxnet3' network devices. >=20 > patch is cherry-picked from the commit mentioned in the oss-security emai= l. >=20 > more info on oss-security [0] >=20 > [0]: https://www.openwall.com/lists/oss-security/2020/08/10/1 >=20 > Signed-off-by: Oguz Bektas > --- > ...t-fix-assertion-failure-in-net_tx_pk.patch | 42 +++++++++++++++++++ > debian/patches/series | 1 + > 2 files changed, 43 insertions(+) > create mode 100644 debian/patches/extra/0002-hw-net-net_tx_pkt-fix-asser= tion-failure-in-net_tx_pk.patch >=20 > diff --git a/debian/patches/extra/0002-hw-net-net_tx_pkt-fix-assertion-fa= ilure-in-net_tx_pk.patch b/debian/patches/extra/0002-hw-net-net_tx_pkt-fix-= assertion-failure-in-net_tx_pk.patch > new file mode 100644 > index 0000000..1b4b2c4 > --- /dev/null > +++ b/debian/patches/extra/0002-hw-net-net_tx_pkt-fix-assertion-failure-i= n-net_tx_pk.patch > @@ -0,0 +1,42 @@ > +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 > +From: Mauro Matteo Cascella > +Date: Sat, 1 Aug 2020 18:42:38 +0200 > +Subject: [PATCH] hw/net/net_tx_pkt: fix assertion failure in > + net_tx_pkt_add_raw_fragment() > + > +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 replac= es the > +affected assert() with a conditional statement, returning false if the c= urrent > +data fragment exceeds max_raw_frags. > + > +Reported-by: Alexander Bulekov > +Reported-by: Ziming Zhang > +Reviewed-by: Dmitry Fleytman > +Signed-off-by: Mauro Matteo Cascella > +Signed-off-by: Jason Wang > +(cherry picked from commit 035e69b063835a5fd23cacabd63690a3d84532a8) > +Signed-off-by: Oguz Bektas > +--- > + 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 162f802dd7..54d4c3bbd0 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 *p= kt, 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.20.1 > + > diff --git a/debian/patches/series b/debian/patches/series > index 00d2c7d..531c5b9 100644 > --- a/debian/patches/series > +++ b/debian/patches/series > @@ -1,4 +1,5 @@ > extra/0001-hw-vfio-pci-quirks-Fix-broken-legacy-IGD-passthrough.patch > +extra/0002-hw-net-net_tx_pkt-fix-assertion-failure-in-net_tx_pk.patch > pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch > pve/0002-PVE-Config-Adjust-network-script-path-to-etc-kvm.patch > pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch > --=20 > 2.20.1 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20 =