From patchwork Tue Apr 9 10:55:36 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: 787197 Delivered-To: patch@linaro.org Received: by 2002:adf:fdd2:0:b0:346:15ad:a2a with SMTP id i18csp154395wrs; Tue, 9 Apr 2024 03:56:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXuSa0IflggANW2pAdYIWDcR7/GhXFsuIHQ2Ron4sPPW3aWG1Wj5Tq3U29hXkjjbJzisGbmJEvBZjRJe/fcNASF X-Google-Smtp-Source: AGHT+IEMQbLplguwr4PGK7FmtV+0yAk3xy/RN5tew1PhxJQk0h0fA1tBN6j5g45fGlnAZ33FCE4d X-Received: by 2002:a37:e31a:0:b0:78d:6479:7c39 with SMTP id y26-20020a37e31a000000b0078d64797c39mr5803999qki.19.1712660202886; Tue, 09 Apr 2024 03:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712660202; cv=none; d=google.com; s=arc-20160816; b=0R8QZEgARYeaoISe2sCBMryoGrfEvyfA+B95hufakWwkYALvttaB62M0O4sEnS5EzX 1LoanDMCiavsss3uLa7vvvXSMKBTAKKwiDIgmmFzYxF/IEnrVKYy/yn/g5PchamYG7d2 6G+DtvbJ8WY9n9HUywGSS5HBDgbpM/ioEW4iz2kDNkbCvMdiRdcH0YipzwVz1sSyo6Ke PbPN14kErhLXIioFehLfQ4FNpoXuF9Lvo4uGXBRwNdX74yldkViCbJ1iXD05OY+syrCJ LoCk6MsT9xYr6W091C3ah754GivUXQjqjq3ZLF10pwX6NCkScOCpyO9cIqRwJBR8w7g8 G7kg== 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=9koRp/akTxCLkggEjRm+VVx6B9q0FvygX7l6hjj+Eio=; fh=efaySp+CZJjT4zsbkUuQsSIewSY05qvC4k2De2XDAlo=; b=jwuL7wEQBo7pOHThXedvpZPtqf9+J12JGGaMY1uRAsLaWlKRsfllk//v5zSE6lITqa 8TgsHV+AvxyhOLZO4pYHK6/dixK1Kk89h7/AanJjV1upNLd2+WD4qaEQ0XrISxqOwAU0 PchBp9Vc0G5NPAGO92q5uWblTV1Rpm6W5DikzUF+EFhqqMrXYmTsbkVVgi2OIRhX7tEg 8B2GB7tPuVxjjJ7Ukoz0j2mOxITlsQrGPv0RUc8q3jbWTG7Q264PPxBsGRKpy8Y2m4sB uR4Ap41R5HT9vDl+L7mBnOamp0wFkdHeYHzazFOghPzVS2rkFxCzUj9cF/kftP9EzlpU m7rw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Oa9cNFht; 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 dt31-20020a05620a479f00b0078d5e64dd6csi6588865qkb.484.2024.04.09.03.56.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Apr 2024 03:56:42 -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=Oa9cNFht; 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 1ru992-0001Q5-P2; Tue, 09 Apr 2024 06:56:04 -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 1ru991-0001PQ-5z for qemu-devel@nongnu.org; Tue, 09 Apr 2024 06:56:03 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ru98y-00039r-IL for qemu-devel@nongnu.org; Tue, 09 Apr 2024 06:56:02 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a51d0dda061so296776866b.1 for ; Tue, 09 Apr 2024 03:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712660158; x=1713264958; 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=9koRp/akTxCLkggEjRm+VVx6B9q0FvygX7l6hjj+Eio=; b=Oa9cNFhtX1Sv9iAqsWZBpBWnRLhlHtuoXu952DnD7cVr4d8WeStvenuTuy12dbOL2S s2iWZ9fCEPFkoc7zMMP8HjTsM0DwUTC8ZY2D+hPXulHYcj5sweRYp/g4x+zRcVjv+RoK m06KbbQeO1sql7HlrRGlnpZSKIyzMBte5aj3egixHIKJb9uek6otm5rbEJWAUL3GgISG 3NHTRUX0SEu928mek/3amMxzySY0ACUkMlJXF+kAsVtYox1bG7IVbrR61CsWrStLJppb 6EPTrJho/RBk9QGbulJDQNUVMaH4Lo7MBz7UlDNnpeDfJtBbCAk6qQvr0WToiBfkHSK9 PBGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712660158; x=1713264958; 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=9koRp/akTxCLkggEjRm+VVx6B9q0FvygX7l6hjj+Eio=; b=FNQa/zAL/6xnXTcR7rxFaKyyRS3kom+VE+rQs1BPRKca75ZuAnuyD2WewK6cFMi5Fp QvBvCrbXOU7yZNZftCR396DulpzD31ZUNwBgbSPDnY5WStW+kR2qFcVUcKY4jCgWM00Q cgftRTUbigQ0kFG69uXa6ot+PZB1uYjdF+tn159a3bnAIlcUuU4j0Pkz0AGf32732lus SWa0Wysd0Zl9G4zlVhZLPGuqeoSQeIVXS8MrMj9STyg00TeNxQNg676+IiSiSi+bCnXe 0rhqPBHOpoei217jZb7H+oGR5JpjxzTjt1aTe2rjQEEwi4ASSgT17/MEg7rLom+SM7iF kTHw== X-Gm-Message-State: AOJu0Yy+DgnQ5cURBPZuEb3vOOLLP902w+qV5cRH/po2y/5HwiDjvE12 SCK62Oj2LAFO20FsZ7KLfqTJD5Q+LsM9RJldJ5af6GsLecZXFZ8BIsbshY8SjtzKPV/4c3G7Gv5 G X-Received: by 2002:a17:906:d205:b0:a51:d081:4bab with SMTP id w5-20020a170906d20500b00a51d0814babmr1999966ejz.21.1712660158691; Tue, 09 Apr 2024 03:55:58 -0700 (PDT) Received: from m1x-phil.lan ([176.176.160.134]) by smtp.gmail.com with ESMTPSA id gl2-20020a170906e0c200b00a4df5e48d11sm5565924ejb.72.2024.04.09.03.55.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 09 Apr 2024 03:55:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Amit Shah , Paolo Bonzini , "Gonglei (Arei)" , Laurent Vivier , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org, Alexander Bulekov Subject: [PATCH-for-9.0 v2 3/4] hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs Date: Tue, 9 Apr 2024 12:55:36 +0200 Message-ID: <20240409105537.18308-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240409105537.18308-1-philmd@linaro.org> References: <20240409105537.18308-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=philmd@linaro.org; helo=mail-ej1-x635.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=unavailable 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. 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é --- hw/char/virtio-serial-bus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 016aba6374..2094d213cd 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; }