From patchwork Thu Apr 18 20:02:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 789856 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp747316wrm; Thu, 18 Apr 2024 13:03:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXyp4gdwKmwh2xnDtxKjP6qJt9fdhMBi91idmi1iUXLDr4yqc6SUYAM9ze1B85CuKI3K8wf4cmaaDQLi1h/HUJk X-Google-Smtp-Source: AGHT+IE/L1Uk8r+kJuGYDDryILcqsoArdwhRSS1WGz5RO0TVg02/dXOOxuNQ/FFXOCQn+jRbcC0R X-Received: by 2002:a67:f70e:0:b0:47b:c50e:54f1 with SMTP id m14-20020a67f70e000000b0047bc50e54f1mr7997vso.4.1713470633391; Thu, 18 Apr 2024 13:03:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713470633; cv=none; d=google.com; s=arc-20160816; b=Z1v6z1stoSmgK4Uk7EaNKmNKeQg0ltyuFVCF6sr/yoN8zJKNyzerBn0sXd6Wdpiwnh SI/jxsnuUP1xKrJMEq0Nmb/+mMYTmI/yEhez0eUOD/pi40KTJvCEUny6w7eTUFwbbvLw E5VjjWH6Z33P3YVu5EUOWAZ/FJIJ2njDjyldUPqdIMF7Px6Wh/CI2xUpHyy3BdgdyQVp cONu428HhfVYpGlizJes1sdgA3XqMfwzz/GFj5UZrLIZ/4QW++GrjdIJwHxq5UHkrQux WPS7gkDN6EGQaDy3tWSAjayw/21Vvll3QGsvNu3uiqQDsDAS3DeeRyrSHHC/PJ/FhKEV Hk3A== 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=wso+bvQj8kRDeRILISYFZEtwMOB0T+5JDwsmYkjgw1lAOclfzDUzZDCC2ycGzsrlvY d7SdAFlXIgy+6sSIRb5MTC9pKu6OsqYzCXQxbZGInr05a8URHzfzj2/oo/NkFkgtZy31 s+1aIH50ickXBR+/aZB7EOXayxXxJLvtDZ6AyWEpphl5IJLnm8eB84hVKmd3biz58Nj1 5PC06l1PrvTOrerv2iszbHXm3GqvUJeNx8UfGrkQmqVHS7R5B3rekRvsgJnqORuKQtDe HQ/5SUgiPYihx08NEYSX/QrQ+JehGB3O+MwUynmbNdPyVrgr7clWQygU28qdY6X0J9Pw p9uA==; 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 e11-20020a0561020f8b00b0047ba52f26b5si638819vsv.427.2024.04.18.13.03.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2024 13:03:53 -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 1rxXxw-0001W9-Mj; Thu, 18 Apr 2024 16:02:40 -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 1rxXxu-0001Vb-US; Thu, 18 Apr 2024 16:02:39 -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 1rxXxs-0005H2-Kx; Thu, 18 Apr 2024 16:02:38 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 818E55FE0D; Thu, 18 Apr 2024 23:02:27 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id E07E2B93F3; Thu, 18 Apr 2024 23:02:24 +0300 (MSK) Received: (nullmailer pid 952854 invoked by uid 1000); Thu, 18 Apr 2024 20:02:24 -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-7.2.11 46/59] hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs Date: Thu, 18 Apr 2024 23:02:06 +0300 Message-Id: <20240418200224.952785-5-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; }