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,URIBL_BLOCKED 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 E7B42C433E0 for ; Wed, 10 Mar 2021 09:07:41 +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 3736B64F2D for ; Wed, 10 Mar 2021 09:07:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3736B64F2D 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]:58416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuoe-0008Lf-4j for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 04:07:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJumM-0007QD-8C for qemu-devel@nongnu.org; Wed, 10 Mar 2021 04:05:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:21361) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lJumE-0000wj-T9 for qemu-devel@nongnu.org; Wed, 10 Mar 2021 04:05:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615367109; 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=PHwQwAW7GR9dZXr3PD66yvM6owEnoF/e7LBY8PGDNhA=; b=YuG+M4sUl8OTpTdx+4xfEIBYCFzilew9Y1+dSrd8RRMf5yCzPwF2FPAAF2QPmgFfu0v+SX MWQUE0rxNjKa2k5CPujabdlFtislV+akLNtBOdU1X3GQ6UbdHI/d0WuzIrHFSRPEahWTPE 2GVrEpmABhgagQ5grSTdid2LSMa//Gg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-358-wC3-ownGMxqnh1DPi6ZiXA-1; Wed, 10 Mar 2021 04:05:06 -0500 X-MC-Unique: wC3-ownGMxqnh1DPi6ZiXA-1 Received: by mail-wm1-f72.google.com with SMTP id r18so2370281wmq.5 for ; Wed, 10 Mar 2021 01:05:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=PHwQwAW7GR9dZXr3PD66yvM6owEnoF/e7LBY8PGDNhA=; b=MebWhA4PNTaOaPmUnD4/ouHfknGWjyb0mRKHYY+/m7IFkpTutvjfgUYe9O7qLn8Kpb 35mc/X8hwZbefMWnEsFppHq2WmfDqEtIPqOBK1evTiNQOR5QY+QaY7QakW9okQeRZ0NX 6kcSIwcYBB8iicE51ta/fM8NTe4KX0/uwY5R3qlMMVEVfA3vkJz/NvqygScUVhA5BWru phT8FYZpH3nZ0k16dhQd2tBD7y97BiRE/CfkFHe0GyR85FL+Nn4nfugwzOdultlVcT9u l0fohP0/fWqDSuW+UKyHkkXm65VoKxRmkOzIWs9wfM1TJU4cNdw+vhIuNafvkIrzwK8P MedA== X-Gm-Message-State: AOAM5323G/D/2/DnUzEGm/CXLIBssFLrvlWiKQXkNaIwPsN9mj0m4C1a t1z94QtH6Tc8uMQPE8usZBxTrYN0kTlmkbxTveo/9X6kv047V+rh0WYoZM/reBrvE2kGD7vMZ73 ThKQa9YZvQ5F9C28= X-Received: by 2002:a05:6000:10cf:: with SMTP id b15mr2362178wrx.183.1615367104739; Wed, 10 Mar 2021 01:05:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwTuBnENIkwCeViLHwSzFQ3MiSp7RUT3bg9vZuGBJVvecY/dOWEgHdSMRzSNnxtq/wC1P0LXA== X-Received: by 2002:a05:6000:10cf:: with SMTP id b15mr2362145wrx.183.1615367104451; Wed, 10 Mar 2021 01:05:04 -0800 (PST) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id d16sm27688054wrx.79.2021.03.10.01.05.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 01:05:04 -0800 (PST) Date: Wed, 10 Mar 2021 10:05:01 +0100 From: Stefano Garzarella To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH v4 4/6] net/eth: Check rt_hdr size before casting to ip6_ext_hdr Message-ID: <20210310090501.baq6kzw6lfsmaujs@steredhat> References: <20210309182709.810955-1-philmd@redhat.com> <20210309182709.810955-5-philmd@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210309182709.810955-5-philmd@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=sgarzare@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=sgarzare@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Laurent Vivier , Thomas Huth , Dmitry Fleytman , Jason Wang , Li Qiang , qemu-devel@nongnu.org, qemu-stable@nongnu.org, Alexander Bulekov , Paolo Bonzini , Miroslav Rezanina Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Mar 09, 2021 at 07:27:07PM +0100, Philippe Mathieu-Daudé wrote: >Do not cast our ip6_ext_hdr pointer to ip6_ext_hdr_routing if there >isn't enough data in the buffer for a such structure. > >This fix a 2 bytes buffer overrun in eth_parse_ipv6_hdr() reported >by QEMU fuzzer: > > $ cat << EOF | ./qemu-system-i386 -M pc-q35-5.0 \ > -accel qtest -monitor none \ > -serial none -nographic -qtest stdio > outl 0xcf8 0x80001010 > outl 0xcfc 0xe1020000 > outl 0xcf8 0x80001004 > outw 0xcfc 0x7 > write 0x25 0x1 0x86 > write 0x26 0x1 0xdd > write 0x4f 0x1 0x2b > write 0xe1020030 0x4 0x190002e1 > write 0xe102003a 0x2 0x0807 > write 0xe1020048 0x4 0x12077cdd > write 0xe1020400 0x4 0xba077cdd > write 0xe1020420 0x4 0x190002e1 > write 0xe1020428 0x4 0x3509d807 > write 0xe1020438 0x1 0xe2 > EOF > ================================================================= > ==2859770==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ffdef904902 at pc 0x561ceefa78de bp 0x7ffdef904820 sp 0x7ffdef904818 > READ of size 1 at 0x7ffdef904902 thread T0 > #0 0x561ceefa78dd in _eth_get_rss_ex_dst_addr net/eth.c:410:17 > #1 0x561ceefa41fb in eth_parse_ipv6_hdr net/eth.c:532:17 > #2 0x561cef7de639 in net_tx_pkt_parse_headers hw/net/net_tx_pkt.c:228:14 > #3 0x561cef7dbef4 in net_tx_pkt_parse hw/net/net_tx_pkt.c:273:9 > #4 0x561ceec29f22 in e1000e_process_tx_desc hw/net/e1000e_core.c:730:29 > #5 0x561ceec28eac in e1000e_start_xmit hw/net/e1000e_core.c:927:9 > #6 0x561ceec1baab in e1000e_set_tdt hw/net/e1000e_core.c:2444:9 > #7 0x561ceebf300e in e1000e_core_write hw/net/e1000e_core.c:3256:9 > #8 0x561cef3cd4cd in e1000e_mmio_write hw/net/e1000e.c:110:5 > > Address 0x7ffdef904902 is located in stack of thread T0 at offset 34 in frame > #0 0x561ceefa320f in eth_parse_ipv6_hdr net/eth.c:486 > > This frame has 1 object(s): > [32, 34) 'ext_hdr' (line 487) <== Memory access at offset 34 overflows this variable > HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork > (longjmp and C++ exceptions *are* supported) > SUMMARY: AddressSanitizer: stack-buffer-overflow net/eth.c:410:17 in _eth_get_rss_ex_dst_addr > Shadow bytes around the buggy address: > 0x10003df188d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df188e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df188f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df18900: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df18910: 00 00 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1 > =>0x10003df18920:[02]f3 f3 f3 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df18930: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df18940: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df18950: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df18960: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 0x10003df18970: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > Shadow byte legend (one shadow byte represents 8 application bytes): > Addressable: 00 > Partially addressable: 01 02 03 04 05 06 07 > Stack left redzone: f1 > Stack right redzone: f3 > ==2859770==ABORTING > >Add the corresponding qtest case with the fuzzer reproducer. > >FWIW GCC 11 similarly reported: > > net/eth.c: In function 'eth_parse_ipv6_hdr': > net/eth.c:410:15: error: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Werror=array-bounds] > 410 | if ((rthdr->rtype == 2) && (rthdr->segleft == 1)) { > | ~~~~~^~~~~~~ > net/eth.c:485:24: note: while referencing 'ext_hdr' > 485 | struct ip6_ext_hdr ext_hdr; > | ^~~~~~~ > net/eth.c:410:38: error: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Werror=array-bounds] > 410 | if ((rthdr->rtype == 2) && (rthdr->segleft == 1)) { > | ~~~~~^~~~~~~~~ > net/eth.c:485:24: note: while referencing 'ext_hdr' > 485 | struct ip6_ext_hdr ext_hdr; > | ^~~~~~~ > >Cc: qemu-stable@nongnu.org >Buglink: https://bugs.launchpad.net/qemu/+bug/1879531 >Reported-by: Alexander Bulekov >Reported-by: Miroslav Rezanina >Fixes: eb700029c78 ("net_pkt: Extend packet abstraction as required by e1000e functionality") >Signed-off-by: Philippe Mathieu-Daudé >--- > net/eth.c | 7 ++++- > tests/qtest/fuzz-e1000e-test.c | 53 ++++++++++++++++++++++++++++++++++ > MAINTAINERS | 1 + > tests/qtest/meson.build | 1 + > 4 files changed, 61 insertions(+), 1 deletion(-) > create mode 100644 tests/qtest/fuzz-e1000e-test.c > >diff --git a/net/eth.c b/net/eth.c >index 77af2b673bb..f0c8dfe8df7 100644 >--- a/net/eth.c >+++ b/net/eth.c >@@ -406,7 +406,12 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, > struct in6_address *dst_addr) > { > size_t input_size = iov_size(pkt, pkt_frags); >- struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr; >+ struct ip6_ext_hdr_routing *rthdr; >+ >+ if (input_size < ext_hdr_offset + sizeof(*rthdr)) { >+ return false; >+ } >+ rthdr = (struct ip6_ext_hdr_routing *) ext_hdr; Also if we check 'input_size', I think this cast keeps having the 2 bytes buffer overrun issue since 'ext_hdr' contains only the first 2 bytes. I think we can remove the 'input_size' check and we should fix in this way: struct ip6_ext_hdr_routing rthdr; bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset, &rthdr, sizeof(rthdr); if (bytes_read < sizeof(rthdr)) { return false; } > > if ((rthdr->rtype == 2) && (rthdr->segleft == 1)) { > size_t bytes_read; >diff --git a/tests/qtest/fuzz-e1000e-test.c b/tests/qtest/fuzz-e1000e-test.c >new file mode 100644 >index 00000000000..66229e60964 >--- /dev/null >+++ b/tests/qtest/fuzz-e1000e-test.c >@@ -0,0 +1,53 @@ >+/* >+ * QTest testcase for e1000e device generated by fuzzer >+ * >+ * Copyright (c) 2021 Red Hat, Inc. >+ * >+ * SPDX-License-Identifier: GPL-2.0-or-later >+ */ >+ >+#include "qemu/osdep.h" >+ >+#include "libqos/libqtest.h" >+ >+/* >+ * https://bugs.launchpad.net/qemu/+bug/1879531 >+ */ >+static void test_lp1879531_eth_get_rss_ex_dst_addr(void) >+{ >+ QTestState *s; >+ >+ s = qtest_init("-nographic -monitor none -serial none -M pc-q35-5.0"); >+ >+ qtest_outl(s, 0xcf8, 0x80001010); >+ qtest_outl(s, 0xcfc, 0xe1020000); >+ qtest_outl(s, 0xcf8, 0x80001004); >+ qtest_outw(s, 0xcfc, 0x7); >+ qtest_writeb(s, 0x25, 0x86); >+ qtest_writeb(s, 0x26, 0xdd); >+ qtest_writeb(s, 0x4f, 0x2b); >+ >+ qtest_writel(s, 0xe1020030, 0x190002e1); >+ qtest_writew(s, 0xe102003a, 0x0807); >+ qtest_writel(s, 0xe1020048, 0x12077cdd); >+ qtest_writel(s, 0xe1020400, 0xba077cdd); >+ qtest_writel(s, 0xe1020420, 0x190002e1); >+ qtest_writel(s, 0xe1020428, 0x3509d807); >+ qtest_writeb(s, 0xe1020438, 0xe2); >+ qtest_writeb(s, 0x4f, 0x2b); >+ qtest_quit(s); >+} >+ >+int main(int argc, char **argv) >+{ >+ const char *arch = qtest_get_arch(); >+ >+ g_test_init(&argc, &argv, NULL); >+ >+ if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { >+ qtest_add_func("fuzz/test_lp1879531_eth_get_rss_ex_dst_addr", >+ test_lp1879531_eth_get_rss_ex_dst_addr); >+ } >+ >+ return g_test_run(); >+} >diff --git a/MAINTAINERS b/MAINTAINERS >index f22d83c1782..4eb5784ff83 100644 >--- a/MAINTAINERS >+++ b/MAINTAINERS >@@ -2003,6 +2003,7 @@ e1000e > M: Dmitry Fleytman > S: Maintained > F: hw/net/e1000e* >+F: tests/qtest/fuzz-e1000e-test.c > > eepro100 > M: Stefan Weil >diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build >index 58efc46144e..7997d895449 100644 >--- a/tests/qtest/meson.build >+++ b/tests/qtest/meson.build >@@ -60,6 +60,7 @@ > (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-test'] : []) + \ > (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-swtpm-test'] : []) + \ > (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : []) + \ >+ (config_all_devices.has_key('CONFIG_E1000E_PCI_EXPRESS') ? ['fuzz-e1000e-test'] : []) + \ > qtests_pci + \ > ['fdc-test', > 'ide-test', >-- >2.26.2 >