From patchwork Thu Apr 18 17:49:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 789815 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp695410wrm; Thu, 18 Apr 2024 10:52:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWo190SvA/PcRjsALngaKzbqPPT1RCqso/ZIFAfKB4XI3si/xLLiG+ImbYkpIIr07ZVmdASfAK1VZ5g05IEhf3K X-Google-Smtp-Source: AGHT+IFCc+am1WfZt+7z4O7uKj2J8P8ePAbxedd2BqTsLKE8i8TkVJzpn+0AcyCDdv7the2YINAP X-Received: by 2002:a05:6359:4e85:b0:183:f634:104 with SMTP id os5-20020a0563594e8500b00183f6340104mr4522153rwb.7.1713462768534; Thu, 18 Apr 2024 10:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713462768; cv=none; d=google.com; s=arc-20160816; b=MuFjpZQ1B+8IBZTZtSsOgHkFx8HeiLVfqRAl4Bp0XwY+AUnNST/JN3jtvbNU5Himyk TY2fxkdTxIeENXt4Fqdjntu7aayPTSPxdC4r5qz1Qx0xGJQwTvcMAlwgU8USjaYic9qZ qIZb0/IlL93I//V8wnWi/Xsl4q9VLzZLVY1TzgmzSBaLnKPQP1JCjwCqgsyWDOWf4HKd VV2V30l/Umb81OXcT9T4g/12E61UfJx641+ODY2cKtEf3zC5YfjN4Q9ylj5wFXMJX4hD uPYm2HOKum7UChIBl9CNrEcVJE6JoDNCX75Bn8jJQp2pIa7KkRLD48niMTfGs+S9U0/I T36Q== 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=KPeWGdfvNJVgsKqMVGh3F0K7KkjbHa4NBeQpt9BTTE8=; fh=0X897gCEnmYo52lVvW9LLW4tOQTGKWBMmNyCdCpJrAU=; b=RxIA0QyDyrY0JjWgrx/+78/LoxvpTzQKIhEIwp98n8gW/Ka6SoZwypEXel1lJE7EJW jzKyHo17+Hg974EtzPDtU8NCyTjtaRN0SoZJZ+zGlj41eBVHbVgewuK5PVHt6Hf7LVtg WYBoT4Xz8+7ojrsLNqFfkSP78FLgSzwIsYFJSULbnV+yDHWbx/b/kySrRb4Yfnbi0yXd 6qG3TGUkbU2j0ayOyT2PDJvHYxYeOu4nR3kcn2WDscEwh9IrRohv4Vf3Lk3B5h23XBVT +tzK8wimWnxTCSEQgmUt7rzliTkeKcx8q0aUIJzLnorPHkzf/T20R/wUhWmOorCuoUQj XXmw==; 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 u20-20020ac858d4000000b004347cf7c206si1971722qta.216.2024.04.18.10.52.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2024 10:52:48 -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 1rxVuI-0000Qg-CK; Thu, 18 Apr 2024 13:50:46 -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 1rxVuG-0000Pe-Kt; Thu, 18 Apr 2024 13:50:44 -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 1rxVuF-0007Z0-1B; Thu, 18 Apr 2024 13:50:44 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 696EE5FD6C; 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 CBB94B9342; Thu, 18 Apr 2024 20:49:59 +0300 (MSK) Received: (nullmailer pid 947839 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 099/116] hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs Date: Thu, 18 Apr 2024 20:49:29 +0300 Message-Id: <20240418174955.947730-12-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-5-philmd@linaro.org> (cherry picked from commit f4729ec39ad97a42ceaa7b5697f84f440ea6e5dc) Signed-off-by: Michael Tokarev diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 0e2cc8d5a8..4aaced74be 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -1080,8 +1080,8 @@ static void virtio_crypto_device_realize(DeviceState *dev, Error **errp) vcrypto->vqs[i].dataq = virtio_add_queue(vdev, 1024, virtio_crypto_handle_dataq_bh); vcrypto->vqs[i].dataq_bh = - qemu_bh_new_guarded(virtio_crypto_dataq_bh, &vcrypto->vqs[i], - &dev->mem_reentrancy_guard); + virtio_bh_new_guarded(dev, virtio_crypto_dataq_bh, + &vcrypto->vqs[i]); vcrypto->vqs[i].vcrypto = vcrypto; }