diff --git a/0001-slirp-check-pkt_len-before-reading-protocol-header.patch b/0001-slirp-check-pkt_len-before-reading-protocol-header.patch new file mode 100644 index 0000000..0c912cb --- /dev/null +++ b/0001-slirp-check-pkt_len-before-reading-protocol-header.patch @@ -0,0 +1,59 @@ +From 2e1dcbc0c2af64fcb17009eaf2ceedd81be2b27f Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit +Date: Thu, 26 Nov 2020 19:27:06 +0530 +Subject: [PATCH] slirp: check pkt_len before reading protocol header +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While processing ARP/NCSI packets in 'arp_input' or 'ncsi_input' +routines, ensure that pkt_len is large enough to accommodate the +respective protocol headers, lest it should do an OOB access. +Add check to avoid it. + +CVE-2020-29129 CVE-2020-29130 + QEMU: slirp: out-of-bounds access while processing ARP/NCSI packets + -> https://www.openwall.com/lists/oss-security/2020/11/27/1 + +Reported-by: Qiuhao Li +Signed-off-by: Prasad J Pandit +Message-Id: <20201126135706.273950-1-ppandit@redhat.com> +Reviewed-by: Marc-André Lureau +--- + src/ncsi.c | 4 ++++ + src/slirp.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/ncsi.c b/src/ncsi.c +index 3c1dfef..75dcc08 100644 +--- a/src/ncsi.c ++++ b/src/ncsi.c +@@ -148,6 +148,10 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) + uint32_t checksum; + uint32_t *pchecksum; + ++ if (pkt_len < ETH_HLEN + sizeof(struct ncsi_pkt_hdr)) { ++ return; /* packet too short */ ++ } ++ + memset(ncsi_reply, 0, sizeof(ncsi_reply)); + + memset(reh->h_dest, 0xff, ETH_ALEN); +diff --git a/src/slirp.c b/src/slirp.c +index 9bead0c..abb6f9a 100644 +--- a/src/slirp.c ++++ b/src/slirp.c +@@ -860,6 +860,10 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) + return; + } + ++ if (pkt_len < ETH_HLEN + sizeof(struct slirp_arphdr)) { ++ return; /* packet too short */ ++ } ++ + ar_op = ntohs(ah->ar_op); + switch (ar_op) { + case ARPOP_REQUEST: +-- +2.29.0 + diff --git a/libslirp.spec b/libslirp.spec index ff28859..60ea94c 100644 --- a/libslirp.spec +++ b/libslirp.spec @@ -1,12 +1,13 @@ Name: libslirp Version: 4.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose TCP-IP emulator # check the SPDX tags in source files for details License: BSD and MIT URL: https://gitlab.freedesktop.org/slirp/%{name} Source0: %{url}/-/archive/v%{version}/%{name}-%{version}.tar.xz +Patch0001: 0001-slirp-check-pkt_len-before-reading-protocol-header.patch BuildRequires: git-core BuildRequires: meson @@ -52,6 +53,10 @@ developing applications that use %{name}. %changelog +* Fri Nov 27 20:10:28 +04 2020 Marc-André Lureau - 4.3.1-3 +- Fix CVE-2020-29129 CVE-2020-29130 out-of-bounds access while processing ARP/NCSI packets + rhbz#1902232 + * Tue Jul 28 2020 Fedora Release Engineering - 4.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild