From patchwork Mon Apr 29 09:19:18 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: 793023 Delivered-To: patch@linaro.org Received: by 2002:adf:ec83:0:b0:34d:5089:5a9e with SMTP id z3csp27384wrn; Mon, 29 Apr 2024 02:20:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWjmuPW4YCUUaGdXdoBNTeYjntUJVay4r1yXJpovYMfFSRqSbMqBRCnPp+FITMZnpbWYE0wnZGZWsPlKy2/n8Bh X-Google-Smtp-Source: AGHT+IEBq67nJ7rHzAOB42DXELZkEGGW1EX4b8U1TyzwlUoOwSOVVYsfYJBLoyUGB0OCT1gVbyrv X-Received: by 2002:a05:620a:3bcf:b0:78a:3a8f:ce4f with SMTP id yf15-20020a05620a3bcf00b0078a3a8fce4fmr10708144qkn.35.1714382435188; Mon, 29 Apr 2024 02:20:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714382435; cv=none; d=google.com; s=arc-20160816; b=HujTngA6bFinwC2HK6Us0OyiqUqejtS9EzfbbhVcYTpcgAd63eKwfzRJXwFQn/yBR9 upWzApBV/Z7AKB1Zs9kEIhqqtwVird298J8bWzqXdTqR8APFLQUdnwdy9TyJnWdZjDFE gc+dDnW5YSPKx49ri6fmj2Qg8ZTYOyHhb2dgutcBZJ/JLu6aNXp9Ia6O5iTR5p3vlSDV ChlKZ45IHKspFAqIFq8sEw4d6D+QfKP03cWPyIxZ7YhdfqpzalCgG4nkVA967bpQrVeU YsdA1Swa0ecBP+KSVovzYkdpwlOkGXWwv+6W7MUhsOpmjvynz4uUOiwcJ2zxZAbo685Q vSCw== 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=nQN2VxcIOLVMa1LnNXtGEPc0ePXAKKxeCQuVKvwbEdE=; fh=aSOCAEeAv2ANrNOfOa1TStHGKpO66mFxEtVkSaD0MxQ=; b=PzRYtmGq1B3L/TYPiv6XDmzQ+v7M/YbKPCNJBpyFfQGi9yp4qEtaCEwdFRhXgz0kaH 6eOp0jjQ98Sc1URsf1C95ADzUupdYNQT6p+IHT9NjM4oHCQS/fP70ta/l6ue3/MRtpY8 c7Aear489Zy2s4hzgsE4ngboU+5bfya8bXXuKUG/LWiPpKlxri60tZ/gwVzISViMKEg2 ZIoLFK0r/VOYnkN/aWigRzDqAK0rdpbbyApBzExViZbczf9clE8rVJm3XtSo76O4S6qK hg37iBPWLcFigog48fAZJieu851c17gnmwMGOS+b2l5Apc1b/SlQUAFBomsuIt92phxM Nb2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CtodmkqR; 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 y20-20020a05620a09d400b00790667bbfbesi20459586qky.493.2024.04.29.02.20.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Apr 2024 02:20:35 -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=CtodmkqR; 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 1s1NAm-0004it-4m; Mon, 29 Apr 2024 05:19: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 1s1NAf-0004hv-97 for qemu-devel@nongnu.org; Mon, 29 Apr 2024 05:19:39 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1NAb-0003Ge-SI for qemu-devel@nongnu.org; Mon, 29 Apr 2024 05:19:36 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-41c7ac6f635so691665e9.3 for ; Mon, 29 Apr 2024 02:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714382370; x=1714987170; 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=nQN2VxcIOLVMa1LnNXtGEPc0ePXAKKxeCQuVKvwbEdE=; b=CtodmkqRy+BGq8YF6UZkCbieRmi8fh2BkYIlVcukIabwNiCFDYsDl45DvokG8L0kUa XDLNPbRnPGKXTa945MQtR1isEd9pe71SyKnYM1UMIT6jWplRAsF4Ykf9Mj4oK1fdrsFj /m7VdfNz6d1vSBZzRgEzB6nGLgTy2pgXGsPesujudt6ydxorpubIc4s8Jqij7Y4OoX7n c1G3PvtEUIOVPuqQ1nwZ64cWYeUsXtQGcTK6+I7V8KS/AcvulqVHjg/KGjA9fGlPt8NH 1JqD1tzR/jcDb7KIBpI188MZEh/KeY1jZ42+WfsDUXzc0DCGqO0R42kW4NTPM7GuvHBh pVIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714382370; x=1714987170; 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=nQN2VxcIOLVMa1LnNXtGEPc0ePXAKKxeCQuVKvwbEdE=; b=Px2H4yZ5ybSx47NP1NzSLEWHIOvncMuqWDj+2R1fehZsTVWdt8pB8S0kopW/5F//vL Cv7/x4pb2HbciRYE/UhzxHiosHurJozP54AJ2BVRTCsJtpZViRWnf/23/4qxW3LROqKq dLG8ojsP/3O3eoFfsjDGCIOczaL81U6M/Ijq+M78Om/v7NFlpcoN/0asCCJ2yki2hHHz i9rW9/qqcQpjLE1YIF2k1Tch2flDomEY43jUBuy0B9pDwO024WEO7MLMy+ZMKF0hxg+P Qk5lt9PFY1gQkimK1BmXNStA9K4Bf3TyOxa7egDK/ye+skVXlFe9oindUswSo1CLpCfv eugg== X-Gm-Message-State: AOJu0Yy7Ua5G5MSg6ATSBk0V9RkHlZSmZI4hOkD1NIHOfxKCCu1gRcfK WgLFug3f8ZU9VyDK6C97ZyopZ/9CA4Osd7BBDCu1N1Ry2P1CbWKo8KncJ0frhVN/B6IqImqawO2 VTJ8= X-Received: by 2002:a05:600c:470e:b0:41b:f979:e19b with SMTP id v14-20020a05600c470e00b0041bf979e19bmr4381596wmo.39.1714382370256; Mon, 29 Apr 2024 02:19:30 -0700 (PDT) Received: from localhost.localdomain ([83.247.137.20]) by smtp.gmail.com with ESMTPSA id z18-20020a5d6412000000b00347ec0469b2sm28842076wru.46.2024.04.29.02.19.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Apr 2024 02:19:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Volker_R=C3=BCmelin?= , Sunil Muthuswamy , Reinoud Zandijk , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 2/2] accel/nvmm: Fix NULL dereference in nvmm_init_vcpu() Date: Mon, 29 Apr 2024 11:19:18 +0200 Message-ID: <20240429091918.27429-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240429091918.27429-1-philmd@linaro.org> References: <20240429091918.27429-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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=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 When mechanically moving the @dirty field to AccelCPUState in commit 79f1926b2d, we neglected cpu->accel is still NULL when we want to dereference it. Reported-by: Volker Rümelin Suggested-by: Volker Rümelin Fixes: 79f1926b2d ("accel/nvmm: Use accel-specific per-vcpu @dirty field") Signed-off-by: Philippe Mathieu-Daudé --- target/i386/nvmm/nvmm-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index f9cced53b3..65768aca03 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -982,7 +982,7 @@ nvmm_init_vcpu(CPUState *cpu) } } - cpu->accel->dirty = true; + qcpu->dirty = true; cpu->accel = qcpu; return 0;