From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9FD9D41EAF for ; Thu, 16 Mar 2023 11:30:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 99EB240FDF; Thu, 16 Mar 2023 11:30:36 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 36E5D40DF6 for ; Thu, 16 Mar 2023 11:30:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678962634; 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=MLMQLMgimCNzdS/8nTFuTNUQupq8HA2Wp9Mygq35V9Q=; b=H09DjII/Pl+FCX9hYmqzcGWt29u3TPC4GiXrOVZhtcjnXYwYlp6th/dlaP7B1O9BlDMpYM wky/Fu7kSsC5t7esr6I8wTl1dy9qCdqEXXdRQ8vlz3I5Eo6zGhgcs67mZGSRxvB1vlsNaK 2Ihvi2iMeSldc1badN8VG1itfxDC7xg= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-167--aSv2q0tOGmBaACKwJRvzA-1; Thu, 16 Mar 2023 06:30:33 -0400 X-MC-Unique: -aSv2q0tOGmBaACKwJRvzA-1 Received: by mail-wr1-f71.google.com with SMTP id r14-20020a0560001b8e00b002cdb76f7e80so184673wru.19 for ; Thu, 16 Mar 2023 03:30:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678962632; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MLMQLMgimCNzdS/8nTFuTNUQupq8HA2Wp9Mygq35V9Q=; b=PcnUqqusbDwRuHy2wNbdsOveqsAr2P/FFLnUaxlfFwN4fjKAtTsm+KKWh9mAdxIR0r QncUp/DcwSaYT8/PpkmeXdkBWEjDNM8iCI97Y3YMRWMesLtLWTk1i3nlyfyvRtnmGJPH aZLBeAJtqZzLYGZMjDIvdL5Qw7J+XK20gMHVw0SX+Vo1vHTkIsxIQIeJOk0TpncVcm1c VZLsrDxKACBT2atjVM88E5mn2Mh6bQRxZmeBBgysOVL73zYHdnIrHrWa9zhJI7m+jae/ QnzScDEBuq+AWPpOQbl7OkiT5X6XH6+LxyN2kBazS4ursVZPc75l4Gwu3zzIgAHqKMzM 88UQ== X-Gm-Message-State: AO0yUKWy2Mj6rriigXK42uP83+/oi7tz9Kpzf84cFKBWBWyFMr8/lqd9 LyODJF3tJMYNOyTJZlQnjG13o7rHeHDy3Jk6FZJDGxH603ahQPbqxJEJuYKUkrS1p7HzOTTSQ/m Ell5QLpY= X-Received: by 2002:adf:f3c9:0:b0:2cf:9889:8428 with SMTP id g9-20020adff3c9000000b002cf98898428mr4163871wrp.35.1678962632571; Thu, 16 Mar 2023 03:30:32 -0700 (PDT) X-Google-Smtp-Source: AK7set9M2SDfVX5YVzGfu2Ut4BFb5l0bwGN/ZyzPUa1fB5BR0JrTtS9NylVyn/dI+EmL8vPTGd+TjA== X-Received: by 2002:adf:f3c9:0:b0:2cf:9889:8428 with SMTP id g9-20020adff3c9000000b002cf98898428mr4163854wrp.35.1678962632215; Thu, 16 Mar 2023 03:30:32 -0700 (PDT) Received: from [192.168.0.36] ([78.19.103.115]) by smtp.gmail.com with ESMTPSA id e6-20020adffc46000000b002c561805a4csm6974100wrs.45.2023.03.16.03.30.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Mar 2023 03:30:31 -0700 (PDT) Message-ID: <750ee800-dbc3-80dc-775c-dc6d39ccdc7a@redhat.com> Date: Thu, 16 Mar 2023 10:30:30 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 To: David Marchand , Luca Boccassi Cc: Maxime Coquelin , dpdk stable References: <20230223093715.3926893-71-luca.boccassi@gmail.com> <20230315224631.1025649-1-luca.boccassi@gmail.com> <20230315224631.1025649-6-luca.boccassi@gmail.com> From: Kevin Traynor Subject: Re: patch 'vhost: fix OOB access for invalid vhost ID' has been queued to stable release 20.11.8 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org On 16/03/2023 09:56, David Marchand wrote: > On Thu, Mar 16, 2023 at 10:27 AM Luca Boccassi wrote: >> >> On Wed, 15 Mar 2023 at 22:46, wrote: >>> >>> Hi, >>> >>> FYI, your patch has been queued to stable release 20.11.8 >>> >>> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. >>> It will be pushed if I get no objections before 03/17/23. So please >>> shout if anyone has objections. >>> >>> Also note that after the patch there's a diff of the upstream commit vs the >>> patch applied to the branch. This will indicate if there was any rebasing >>> needed to apply to the stable branch. If there were code changes for rebasing >>> (ie: not only metadata diffs), please double check that the rebase was >>> correctly done. >>> >>> Queued patches are on a temporary branch at: >>> https://github.com/bluca/dpdk-stable >>> >>> This queued commit can be viewed at: >>> https://github.com/bluca/dpdk-stable/commit/145ffdbb7ea750f4d3b17446bde22a805957ad71 >>> >>> Thanks. >>> >>> Luca Boccassi >>> >>> --- >>> From 145ffdbb7ea750f4d3b17446bde22a805957ad71 Mon Sep 17 00:00:00 2001 >>> From: David Marchand >>> Date: Mon, 27 Feb 2023 11:59:27 +0100 >>> Subject: [PATCH] vhost: fix OOB access for invalid vhost ID >>> >>> [ upstream commit 1c80a404fd82b816d5c3ebb7cd9e89804ac63984 ] >>> >>> The net/vhost pmd currently provides a -1 vid when disabling interrupt >>> after a virtio port got disconnected. >>> >>> This can be caught when running with ASan. >>> >>> First, start dpdk-l3fwd-power in interrupt mode with a net/vhost port. >>> >>> $ ./build-clang/examples/dpdk-l3fwd-power -l0,1 --in-memory \ >>> -a 0000:00:00.0 \ >>> --vdev net_vhost0,iface=plop.sock,client=1\ >>> -- \ >>> -p 0x1 \ >>> --interrupt-only \ >>> --config '(0,0,1)' \ >>> --parse-ptype 0 >>> >>> Then start testpmd with virtio-user. >>> >>> $ ./build-clang/app/dpdk-testpmd -l0,2 --single-file-segment --in-memory \ >>> -a 0000:00:00.0 \ >>> --vdev net_virtio_user0,path=plop.sock,server=1 \ >>> -- \ >>> -i >>> >>> Finally stop testpmd. >>> ASan then splats in dpdk-l3fwd-power: >>> >>> ================================================================= >>> ==3641005==ERROR: AddressSanitizer: global-buffer-overflow on address >>> 0x000005ed0778 at pc 0x000001270f81 bp 0x7fddbd2eee20 >>> sp 0x7fddbd2eee18 >>> READ of size 8 at 0x000005ed0778 thread T2 >>> #0 0x1270f80 in get_device .../lib/vhost/vhost.h:801:27 >>> #1 0x1270f80 in rte_vhost_get_vhost_vring .../lib/vhost/vhost.c:951:8 >>> #2 0x3ac95cb in eth_rxq_intr_disable >>> .../drivers/net/vhost/rte_eth_vhost.c:647:8 >>> #3 0x170e0bf in rte_eth_dev_rx_intr_disable >>> .../lib/ethdev/rte_ethdev.c:5443:25 >>> #4 0xf72ba7 in turn_on_off_intr .../examples/l3fwd-power/main.c:881:4 >>> #5 0xf71045 in main_intr_loop .../examples/l3fwd-power/main.c:1061:6 >>> #6 0x17f9292 in eal_thread_loop >>> .../lib/eal/common/eal_common_thread.c:210:9 >>> #7 0x18373f5 in eal_worker_thread_loop .../lib/eal/linux/eal.c:915:2 >>> #8 0x7fddc16ae12c in start_thread (/lib64/libc.so.6+0x8b12c) >>> (BuildId: 81daba31ee66dbd63efdc4252a872949d874d136) >>> #9 0x7fddc172fbbf in __GI___clone3 (/lib64/libc.so.6+0x10cbbf) >>> (BuildId: 81daba31ee66dbd63efdc4252a872949d874d136) >>> >>> 0x000005ed0778 is located 8 bytes to the left of global variable >>> 'vhost_devices' defined in '.../lib/vhost/vhost.c:24' >>> (0x5ed0780) of size 8192 >>> 0x000005ed0778 is located 20 bytes to the right of global variable >>> 'vhost_config_log_level' defined in '.../lib/vhost/vhost.c:2174' >>> (0x5ed0760) of size 4 >>> SUMMARY: AddressSanitizer: global-buffer-overflow >>> .../lib/vhost/vhost.h:801:27 in get_device >>> Shadow bytes around the buggy address: >>> 0x000080bd2090: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 >>> 0x000080bd20a0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 >>> 0x000080bd20b0: f9 f9 f9 f9 00 f9 f9 f9 00 f9 f9 f9 00 f9 f9 f9 >>> 0x000080bd20c0: 00 00 00 00 00 00 00 f9 f9 f9 f9 f9 04 f9 f9 f9 >>> 0x000080bd20d0: 00 00 00 00 00 f9 f9 f9 f9 f9 f9 f9 00 00 00 00 >>> =>0x000080bd20e0: 00 f9 f9 f9 f9 f9 f9 f9 04 f9 f9 f9 04 f9 f9[f9] >>> 0x000080bd20f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 >>> 0x000080bd2100: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 >>> 0x000080bd2110: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 >>> 0x000080bd2120: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 >>> 0x000080bd2130: 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 >>> Heap left redzone: fa >>> Freed heap region: fd >>> Stack left redzone: f1 >>> Stack mid redzone: f2 >>> Stack right redzone: f3 >>> Stack after return: f5 >>> Stack use after scope: f8 >>> Global redzone: f9 >>> Global init order: f6 >>> Poisoned by user: f7 >>> Container overflow: fc >>> Array cookie: ac >>> Intra object redzone: bb >>> ASan internal: fe >>> Left alloca redzone: ca >>> Right alloca redzone: cb >>> Thread T2 created by T0 here: >>> #0 0xe98996 in __interceptor_pthread_create >>> (.examples/dpdk-l3fwd-power+0xe98996) >>> (BuildId: d0b984a3b0287b9e0f301b73426fa921aeecca3a) >>> #1 0x1836767 in eal_worker_thread_create .../lib/eal/linux/eal.c:952:6 >>> #2 0x1834b83 in rte_eal_init .../lib/eal/linux/eal.c:1257:9 >>> #3 0xf68902 in main .../examples/l3fwd-power/main.c:2496:8 >>> #4 0x7fddc164a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) >>> (BuildId: 81daba31ee66dbd63efdc4252a872949d874d136) >>> >>> ==3641005==ABORTING >>> >>> More generally, any application passing an incorrect vid would trigger >>> such an OOB access. >>> >>> Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") >>> >>> Signed-off-by: David Marchand >>> Reviewed-by: Maxime Coquelin >>> --- >>> lib/librte_vhost/vhost.h | 5 ++++- >>> 1 file changed, 4 insertions(+), 1 deletion(-) >>> >>> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h >>> index 92b67a2c6f..ee4e5317d0 100644 >>> --- a/lib/librte_vhost/vhost.h >>> +++ b/lib/librte_vhost/vhost.h >>> @@ -663,7 +663,10 @@ hva_to_gpa(struct virtio_net *dev, uint64_t vva, uint64_t len) >>> static __rte_always_inline struct virtio_net * >>> get_device(int vid) >>> { >>> - struct virtio_net *dev = vhost_devices[vid]; >>> + struct virtio_net *dev = NULL; >>> + >>> + if (likely(vid >= 0 && vid < RTE_MAX_VHOST_DEVICE)) >>> + dev = vhost_devices[vid]; >>> >>> if (unlikely(!dev)) { >>> VHOST_LOG_CONFIG(ERR, >>> -- >>> 2.39.2 >>> >>> --- >>> Diff of the applied patch vs upstream commit (please double-check if non-empty: >>> --- >>> --- - 2023-03-15 22:44:50.000737881 +0000 >>> +++ 0006-vhost-fix-OOB-access-for-invalid-vhost-ID.patch 2023-03-15 22:44:49.507848667 +0000 >>> @@ -1 +1 @@ >>> -From 1c80a404fd82b816d5c3ebb7cd9e89804ac63984 Mon Sep 17 00:00:00 2001 >>> +From 145ffdbb7ea750f4d3b17446bde22a805957ad71 Mon Sep 17 00:00:00 2001 >>> @@ -5,0 +6,2 @@ >>> +[ upstream commit 1c80a404fd82b816d5c3ebb7cd9e89804ac63984 ] >>> + >>> @@ -109 +110,0 @@ >>> -Cc: stable@dpdk.org >>> @@ -114 +115 @@ >>> - lib/vhost/vhost.h | 5 ++++- >>> + lib/librte_vhost/vhost.h | 5 ++++- >>> @@ -117,5 +118,5 @@ >>> -diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h >>> -index 5750f0c005..954c0ac197 100644 >>> ---- a/lib/vhost/vhost.h >>> -+++ b/lib/vhost/vhost.h >>> -@@ -798,7 +798,10 @@ hva_to_gpa(struct virtio_net *dev, uint64_t vva, uint64_t len) >>> +diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h >>> +index 92b67a2c6f..ee4e5317d0 100644 >>> +--- a/lib/librte_vhost/vhost.h >>> ++++ b/lib/librte_vhost/vhost.h >>> +@@ -663,7 +663,10 @@ hva_to_gpa(struct virtio_net *dev, uint64_t vva, uint64_t len) >>> @@ -132 +133 @@ >>> - VHOST_LOG_CONFIG("device", ERR, "(%d) device not found.\n", vid); >>> + VHOST_LOG_CONFIG(ERR, >> >> I actually had to drop this as it doesn't build (forgot to drop this >> and the revert) > > MAX_VHOST_DEVICE has been renamed as RTE_MAX_VHOST_DEVICE. > So I guess the build issue comes from using RTE_MAX_VHOST_DEVICE. > > Can you have a try? > > You can cherry-pick from https://git.dpdk.org/dpdk-stable/commit/?h=21.11-staging&id=7a4cda6e20f9a6e27b015aad864685440a70af84