From patchwork Thu Apr 18 17:49:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 789814 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp695406wrm; Thu, 18 Apr 2024 10:52:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/HDshVaWxG9nDbmCGrZ1bLJ8QV2MPLvKPdVU8y62zbgojmvdkpoYng6IbflWhvDSUpT20CslrxaBCytyv7OjD X-Google-Smtp-Source: AGHT+IHyhwULiENAAIA4MKjF1FUyVFhWr3OkeWKdeujOr5/ANC1LRSmYBfkKm1z14k2BbkMvykNO X-Received: by 2002:a05:620a:2992:b0:78f:15b9:83a2 with SMTP id r18-20020a05620a299200b0078f15b983a2mr1057110qkp.3.1713462767600; Thu, 18 Apr 2024 10:52:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713462767; cv=none; d=google.com; s=arc-20160816; b=iMFwi5hZaY+Xv6tZccXcF2pu5RiMGEYL6ha/uuD/xV2wbO3SndTUKwImAGGFeyn3uX a12I6HwdkdnDGSjGpp4QeMypz9MUD4DfqPJOH9b2MFIrDO/g7J9SSVUWfncyl1/dc1Sw VXCgcEC+YVoyTs+kyYpWNnT2/P2bgNOslp6I/Q3D2Xg5vlHqqB5BnduixqUzFWHTauwQ jmcDaRFRA0T0lhHyCJPh2IL7Q58L/PsHgumEsisDM+0t/MSIUNW7wN50meJSTByHodfC U4MpgQr+/o4BTmRfiiSiLkRZ5OoQdCGAGXQ3p1pL+ddf7uJPSvUJqvez1MpElRemEqk/ AUZw== 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; bh=XSnmGl4V6bmSMClnGXhqIyAezsxYcYtsJm9KOWlsLWA=; fh=0X897gCEnmYo52lVvW9LLW4tOQTGKWBMmNyCdCpJrAU=; b=QwGNLNXDpG51MVK/yACkQqemCqpyYAwCYRGB+Hc83/uV6QC0i+hyj/de45ljLdKpPA 32XD5aQ/0zKjV/sHpqSKj/MYYaV9CXlJP5UXD8LtrgMAgQ4ygNBQ0hdjhmyJpwnwA4Qz OnkIwlP6zItzuBYEyTTX/gb4XLHDocJnTSjLcRqLBawFqrMs8RxaV1YitoF33uWgu4Xf jnTH6EPQ5V9f5gCXjYHm+NUTqmyxkGTUZWBO729c73tjEshgcSEBWRQCQrY0JVum9Fg7 rLHqFW1+Khy1grKqG/a6Uysgydv+eeiZnyZjZDWE0pQ9M+oc7AU8cDDD06j30TSUGV0E xxrg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k15-20020a05620a0b8f00b0078ef43c7087si1821547qkh.311.2024.04.18.10.52.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2024 10:52:47 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxVuG-0000PI-95; Thu, 18 Apr 2024 13:50:44 -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 1rxVuD-0000O8-SQ; Thu, 18 Apr 2024 13:50:41 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxVuC-0007YX-7T; Thu, 18 Apr 2024 13:50:41 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3A80B5FD6B; Thu, 18 Apr 2024 20:50:02 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 88640B9341; Thu, 18 Apr 2024 20:49:59 +0300 (MSK) Received: (nullmailer pid 947836 invoked by uid 1000); Thu, 18 Apr 2024 17:49:55 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov , Gerd Hoffmann , "Michael S . Tsirkin" , Michael Tokarev Subject: [Stable-8.2.3 098/116] hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs Date: Thu, 18 Apr 2024 20:49:28 +0300 Message-Id: <20240418174955.947730-11-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Philippe Mathieu-Daudé 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. Fixes: CVE-2024-3446 Cc: qemu-stable@nongnu.org Suggested-by: Alexander Bulekov Reviewed-by: Gerd Hoffmann Acked-by: Michael S. Tsirkin Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Message-Id: <20240409105537.18308-4-philmd@linaro.org> (cherry picked from commit b4295bff25f7b50de1d9cc94a9c6effd40056bca) Signed-off-by: Michael Tokarev diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index dd619f0731..1221fb7f15 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -985,8 +985,7 @@ static void virtser_port_device_realize(DeviceState *dev, Error **errp) return; } - port->bh = qemu_bh_new_guarded(flush_queued_data_bh, port, - &dev->mem_reentrancy_guard); + port->bh = virtio_bh_new_guarded(dev, flush_queued_data_bh, port); port->elem = NULL; }