From patchwork Thu Apr 4 19:13:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 785825 Delivered-To: patch@linaro.org Received: by 2002:adf:f001:0:b0:33e:7753:30bd with SMTP id j1csp995109wro; Thu, 4 Apr 2024 12:14:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVAx/rvXO8YOPWq4dbyIsPzAOcabHcIVyGa+djGahEKP/Ej0bfuzOKEQPnnXiTx3gOPuAKttaC7yW0/E8LVxKHl X-Google-Smtp-Source: AGHT+IGhze2lifaJ8n83M7oG6QBjNrqGp3YSVeeors89tX8oIPHg7mlBVi8BwINmufTsQUU7v5jz X-Received: by 2002:a81:a54f:0:b0:611:7132:e6ba with SMTP id v15-20020a81a54f000000b006117132e6bamr3776866ywg.40.1712258077793; Thu, 04 Apr 2024 12:14:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712258077; cv=none; d=google.com; s=arc-20160816; b=A8bTFzfzSz/znkhlHn8EhNsJRkIHGbEC4WLxy1+PDo+AhmSe7x1dzq7IPF2Wf4lhid scIrGbTGMiIpR9Xl0Q0JTRXLEqjiOdztqTBpOEKP2BQwuBKv7AhZ/vLA0d4Dk/dyEzLP l3hHgYHlVhxL0A4OQq03vk6h4sAGO1YAXw/S5ZNwpZ/f0P8lzFSxE35FrJrRRKFmX8UO le96VaZ+Jmed4CNDd6jWJmwL0+paqVokofJiQuh/dC5Mh6A44gQ6wKbSlKSLmhRtFy3Y 1TJG3BEfQrF/+dcdihQnGPhbQ3p6/ssL6xR+Qa7EQmce/iygBktgdCyUdmUPEbSmDhm+ qWEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QHbMdOAODgINQwjAjZnCEp30C4hPyCgHI0kFqKRWwYo=; fh=44nHfMYRpwWBZnXpe0K4n0Y+7CdN+IawWpzYWNtaCsU=; b=MdlF60OXpfGgdUCKitQATriXjPUy0ephwRZbIA6cOUhV0Ek8efJU0zp6t6D1H5/4B1 3FCHT5ImOK5ttOGp3AnWGYMFlKsc00bMOJ3qGhhSocN0s2tPD2L/Jm+BFy0mwXKWKfmT b6kdeUmg2qQDaLQJDSP45g9fuXMjuqpUrv5jdepOhj+T04i0VVfiwx3yYBK5kkbRCQqL bwtj24bkhEbDCK9bWZpVncil+rNkCvMK2Z5HRCjvYZ8+hRO6qOx8cqIHUy+E5jGa3e+t rYyWRDSt9NGfn33pRghcSRNNdKodgDOdTpCxgkKCnK56VNXRTvICneHbEzBBsfN9zX7r QTiw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dXmbbgr5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h17-20020ac85851000000b004314838f893si2925450qth.558.2024.04.04.12.14.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Apr 2024 12:14:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dXmbbgr5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsSXB-00064e-Jz; Thu, 04 Apr 2024 15:14:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rsSX9-00063d-RI for qemu-devel@nongnu.org; Thu, 04 Apr 2024 15:13:59 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsSX6-0005WQ-AI for qemu-devel@nongnu.org; Thu, 04 Apr 2024 15:13:59 -0400 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-56c404da0ebso2141749a12.0 for ; Thu, 04 Apr 2024 12:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712258034; x=1712862834; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QHbMdOAODgINQwjAjZnCEp30C4hPyCgHI0kFqKRWwYo=; b=dXmbbgr5W7vihir7enlinS7eS9C1PQ66OYvxHHk6iFGcH3p75HHj1plYB5yQmA0Y6c RDZBk6kn8WI8Jf7nrfT68unwQuu6saFfZeRfCGI5i038ftLV+TQNo7TzOVAU1xE92nmf CP/NukNpV/m5AdGS4xluCxW+GaKQDGxa7Skg4rcNcRsi4De8PuRZshLVLMTBBGoXYiHH sA9MGGuHbQ3la34wnySpOpYvYkcWgixD4/0KqihDzeAHCdaUg8a95QabOIoZEBmnHv6l FbcrBuFNrAxl4DdGYq9m+AePuZ5mFqsNJ+4bbcAQeD9i6XvWKF+BWf4NP8JpVOV3tkyo Hzpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712258034; x=1712862834; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QHbMdOAODgINQwjAjZnCEp30C4hPyCgHI0kFqKRWwYo=; b=HRB3B1jT1oXDD6PAIekFFuvY1wzVw+7Tzr5D+f+vzYl+5DKG4YFAnkYWakqJhJIS7J joJrG5Cg8bRy4P1G7uykPT6Bq+6g/FM1W1fLEJFOnxC/ZAdLHeyaUQOgPowvjdI889AO GUcWXEpM6NeMrI/uldn85ritxcJ2hL+kvAIvFBA8Lra0mxVg25oBm6QYTi6BmfzbyB25 oEpSRK7jj2/TqDOfR69i7Sx/wGbgVk+q5GCplftM68rtXCe1f8Xrtoj5qp9tKZJlcD57 2R8zf/viiLTOe5OPs2e8zjow1w9TvjcCwoW5WeXIIZ+8JMXxMaer1rCeOgP9LQQsDU2H EKdw== X-Gm-Message-State: AOJu0YzX8ypsNoMDj9nyIl8vwos5v+rXpN6SsgsUGJDeH/92VzLvAj13 6Z5iVq+j9jmGP+Tz17qBKc8SRcMNaY5K6pP/dfXmxF6DcXKhFKOqadtc9e3EmMkdOpnimXUriHO e X-Received: by 2002:a17:907:3d8f:b0:a51:879f:a457 with SMTP id he15-20020a1709073d8f00b00a51879fa457mr2759701ejc.5.1712258034325; Thu, 04 Apr 2024 12:13:54 -0700 (PDT) Received: from m1x-phil.lan ([176.187.216.111]) by smtp.gmail.com with ESMTPSA id s4-20020a1709062ec400b00a4a33cfe593sm9395532eji.39.2024.04.04.12.13.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 04 Apr 2024 12:13:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Amit Shah , "Michael S. Tsirkin" , Alexander Bulekov , "Gonglei (Arei)" , =?utf-8?q?Marc-Andr=C3=A9_Lurea?= =?utf-8?q?u?= , Laurent Vivier , Mauro Matteo Cascella , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org, Yongkang Jia , Xiao Lei , Yiming Tao Subject: [PATCH-for-9.0 2/4] hw/display/virtio-gpu: Protect from DMA re-entrancy bugs Date: Thu, 4 Apr 2024 21:13:37 +0200 Message-ID: <20240404191339.5688-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240404191339.5688-1-philmd@linaro.org> References: <20240404191339.5688-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=philmd@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Replace qemu_bh_new_guarded() by virtio_bh_new_guarded() so the bus and device use the same guard. Otherwise the DMA-reentrancy protection can be bypassed: $ cat << EOF | qemu-system-i386 -display none -nodefaults \ -machine q35,accel=qtest \ -m 512M \ -device virtio-gpu \ -qtest stdio outl 0xcf8 0x80000820 outl 0xcfc 0xe0004000 outl 0xcf8 0x80000804 outw 0xcfc 0x06 write 0xe0004030 0x4 0x024000e0 write 0xe0004028 0x1 0xff write 0xe0004020 0x4 0x00009300 write 0xe000401c 0x1 0x01 write 0x101 0x1 0x04 write 0x103 0x1 0x1c write 0x9301c8 0x1 0x18 write 0x105 0x1 0x1c write 0x107 0x1 0x1c write 0x109 0x1 0x1c write 0x10b 0x1 0x00 write 0x10d 0x1 0x00 write 0x10f 0x1 0x00 write 0x111 0x1 0x00 write 0x113 0x1 0x00 write 0x115 0x1 0x00 write 0x117 0x1 0x00 write 0x119 0x1 0x00 write 0x11b 0x1 0x00 write 0x11d 0x1 0x00 write 0x11f 0x1 0x00 write 0x121 0x1 0x00 write 0x123 0x1 0x00 write 0x125 0x1 0x00 write 0x127 0x1 0x00 write 0x129 0x1 0x00 write 0x12b 0x1 0x00 write 0x12d 0x1 0x00 write 0x12f 0x1 0x00 write 0x131 0x1 0x00 write 0x133 0x1 0x00 write 0x135 0x1 0x00 write 0x137 0x1 0x00 write 0x139 0x1 0x00 write 0xe0007003 0x1 0x00 EOF ... ================================================================= ==276099==ERROR: AddressSanitizer: heap-use-after-free on address 0x60d000011178 at pc 0x562cc3b736c7 bp 0x7ffed49dee60 sp 0x7ffed49dee58 READ of size 8 at 0x60d000011178 thread T0 #0 0x562cc3b736c6 in virtio_gpu_ctrl_response hw/display/virtio-gpu.c:180:42 #1 0x562cc3b7c40b in virtio_gpu_ctrl_response_nodata hw/display/virtio-gpu.c:192:5 #2 0x562cc3b7c40b in virtio_gpu_simple_process_cmd hw/display/virtio-gpu.c:1015:13 #3 0x562cc3b82873 in virtio_gpu_process_cmdq hw/display/virtio-gpu.c:1050:9 #4 0x562cc4a85514 in aio_bh_call util/async.c:169:5 #5 0x562cc4a85c52 in aio_bh_poll util/async.c:216:13 #6 0x562cc4a1a79b in aio_dispatch util/aio-posix.c:423:5 #7 0x562cc4a8a2da in aio_ctx_dispatch util/async.c:358:5 #8 0x7f36840547a8 in g_main_context_dispatch (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x547a8) #9 0x562cc4a8b753 in glib_pollfds_poll util/main-loop.c:290:9 #10 0x562cc4a8b753 in os_host_main_loop_wait util/main-loop.c:313:5 #11 0x562cc4a8b753 in main_loop_wait util/main-loop.c:592:11 #12 0x562cc3938186 in qemu_main_loop system/runstate.c:782:9 #13 0x562cc43b7af5 in qemu_default_main system/main.c:37:14 #14 0x7f3683a6c189 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 #15 0x7f3683a6c244 in __libc_start_main csu/../csu/libc-start.c:381:3 #16 0x562cc2a58ac0 in _start (qemu-system-i386+0x231bac0) 0x60d000011178 is located 56 bytes inside of 136-byte region [0x60d000011140,0x60d0000111c8) freed by thread T0 here: #0 0x562cc2adb662 in __interceptor_free (qemu-system-i386+0x239e662) #1 0x562cc3b86b21 in virtio_gpu_reset hw/display/virtio-gpu.c:1524:9 #2 0x562cc416e20e in virtio_reset hw/virtio/virtio.c:2145:9 #3 0x562cc37c5644 in virtio_pci_reset hw/virtio/virtio-pci.c:2249:5 #4 0x562cc4233758 in memory_region_write_accessor system/memory.c:497:5 #5 0x562cc4232eea in access_with_adjusted_size system/memory.c:573:18 previously allocated by thread T0 here: #0 0x562cc2adb90e in malloc (qemu-system-i386+0x239e90e) #1 0x7f368405a678 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x5a678) #2 0x562cc4163ffc in virtqueue_split_pop hw/virtio/virtio.c:1612:12 #3 0x562cc4163ffc in virtqueue_pop hw/virtio/virtio.c:1783:16 #4 0x562cc3b91a95 in virtio_gpu_handle_ctrl hw/display/virtio-gpu.c:1112:15 #5 0x562cc4a85514 in aio_bh_call util/async.c:169:5 #6 0x562cc4a85c52 in aio_bh_poll util/async.c:216:13 #7 0x562cc4a1a79b in aio_dispatch util/aio-posix.c:423:5 SUMMARY: AddressSanitizer: heap-use-after-free hw/display/virtio-gpu.c:180:42 in virtio_gpu_ctrl_response With this change, the same reproducer triggers: qemu-system-i386: warning: Blocked re-entrant IO on MemoryRegion: virtio-pci-common-virtio-gpu at addr: 0x6 Cc: qemu-stable@nongnu.org Reported-by: Alexander Bulekov Reported-by: Yongkang Jia Reported-by: Xiao Lei Reported-by: Yiming Tao Buglink: https://bugs.launchpad.net/qemu/+bug/1888606 Signed-off-by: Philippe Mathieu-Daudé --- hw/display/virtio-gpu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 78d5a4f164..3ab94a9735 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1492,10 +1492,8 @@ void virtio_gpu_device_realize(DeviceState *qdev, Error **errp) g->ctrl_vq = virtio_get_queue(vdev, 0); g->cursor_vq = virtio_get_queue(vdev, 1); - g->ctrl_bh = qemu_bh_new_guarded(virtio_gpu_ctrl_bh, g, - &qdev->mem_reentrancy_guard); - g->cursor_bh = qemu_bh_new_guarded(virtio_gpu_cursor_bh, g, - &qdev->mem_reentrancy_guard); + g->ctrl_bh = virtio_bh_new_guarded(vdev, virtio_gpu_ctrl_bh, g); + g->cursor_bh = virtio_bh_new_guarded(vdev, virtio_gpu_cursor_bh, g); g->reset_bh = qemu_bh_new(virtio_gpu_reset_bh, g); qemu_cond_init(&g->reset_cond); QTAILQ_INIT(&g->reslist);