From patchwork Thu Apr 18 20:02:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 789866 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp748916wrm; Thu, 18 Apr 2024 13:07:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJWFpuO1fWyuzGBS+e5Van434Didiszs13g15fStZ01/rwWGNK/MAXRNLNQYpX4mPWYOIVUK881fqwwekWHOmt X-Google-Smtp-Source: AGHT+IHfSht2duMePBDYUJx8Mv2eFa7SxdnhH99q5F9HjQ/2UaqO9EeGXyV7FxqVZgsvq3EmUdVP X-Received: by 2002:a05:620a:2159:b0:78f:1040:4d2a with SMTP id m25-20020a05620a215900b0078f10404d2amr184622qkm.35.1713470841927; Thu, 18 Apr 2024 13:07:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713470841; cv=none; d=google.com; s=arc-20160816; b=sg3htAJnj2ZQNqj/qjIA/PyCvyXelXsvZXJQuyQls0ILP1RVsYOwoaQHEBv2UCKXeA fCCIIa269VpGUGpHHoK5xLMYOdGU76kHVwQEwOE6t/xjboYxWrBzozeYw4xyp53kXnDu c4Gf5qAhLHkvA9vHD+t1TFnsNPUNJvE02o+OcA/DwUEq18S+Sxu2zNT1/i3WncTzBIhf gdKPFX7OUvFQxx32pBAWO8KKAm5yWY4w8BaNcEanhp9sAVPXvB59wa7jCOxYWjor6E4q DQDQcQlCfUxouaDMg0+v5oYki+jBHzWjS8jJQHtJpdG6Yesfw4ew2kTHhGdodX3pacGP lRUA== 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=tyeteKFRjlfeqsxs9Z4U3Q7mznRxJtfiErQsAPO6n8k=; fh=0X897gCEnmYo52lVvW9LLW4tOQTGKWBMmNyCdCpJrAU=; b=O+By8ydCPFS5IOsIQwgUdOmrTrTFYYZWxa8XRnUFowM8NawSkQvxFUKXF/pHKpN8J7 u3uIy4NFr/0YRVqJTyWhLEWtvjuRre4qURF8EmnTTwsTgdyriqCOKKAVK+YTnJOR7bm4 VG+jFUTCLoP0xkZNSZe3v9jjgMlYN+Zr7ogThqEFObv7pY5k2s8udfcHt/6PnVS3m57M xvngw0XS8ad01a9FvcNlbWSqdE9n3W/v4aAROtVNmCDv/lgJODpdygwUoqk/gXLGjdfH rrliwo52JND19G/rciWu0PkQx52TZ/rO+G3yJGcAgDuoZhQ932ndGRrUbd8Sg7DLK4mO q0ug==; 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 h13-20020a05620a13ed00b0078842405561si2228428qkl.734.2024.04.18.13.07.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2024 13:07:21 -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 1rxXyQ-0001ea-CB; Thu, 18 Apr 2024 16:03:10 -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 1rxXy1-0001YN-7A; Thu, 18 Apr 2024 16:02:45 -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 1rxXxx-0005HV-Pt; Thu, 18 Apr 2024 16:02:44 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 943B85FE0E; 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 F28F3B93F4; Thu, 18 Apr 2024 23:02:24 +0300 (MSK) Received: (nullmailer pid 952857 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 47/59] hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs Date: Thu, 18 Apr 2024 23:02:07 +0300 Message-Id: <20240418200224.952785-6-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 b2e0646d9a..ce995c66d8 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -1057,8 +1057,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; }