From patchwork Fri May 3 15:36:00 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: 794393 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp800316wrr; Fri, 3 May 2024 08:36:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWo7P6VArOe6Fnq40bnp4KcskdQRxsOlmI1lJ9NQGG1UTR2SB3DEOSeMcP9N1XvxTBX2dWNXBpc5ogj9q85ZxJx X-Google-Smtp-Source: AGHT+IGF1XZ4U6ijF4P23gWJdH+n8GNkPcCjQRyU2YVDJ05QUWMbLRSHVFpkiTwKNa8A0t2jF0yD X-Received: by 2002:a05:6122:20a5:b0:4d4:34b2:9a89 with SMTP id i37-20020a05612220a500b004d434b29a89mr3542771vkd.8.1714750603480; Fri, 03 May 2024 08:36:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714750603; cv=none; d=google.com; s=arc-20160816; b=yGgaqxynfsWK38BLW6Rd9h/X26PcQFYpX1nACHhUC731uljy7WmnJGeoDWlPUva0Qp bWHHdWzI9SjL3V65XYdV68NzHk430nCt+D9tdqEA4GjXGSffsJxS6TJ8myvoJNHcCleb fbY2khyE1Qfi5vIbTqUx7UDZwzXF4ppvd5oHXAKKK/Qi82Jtd6bMfhmUFBR9HkIiKYmQ j/pb2EjeE1mj2271u4kLXv92PctTrsW3OdtesIX61lgvF2y+2QGCCFrgRPJXkidhnpOs 8+gO7xdYdkHWTcx2BRHdo2gVz8seozXHb9S/1ir5Zn3KGIXU89R0MYwUNT5w2MVTTo4y mJKw== 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=qelxLGP2VCXMcEaYFfotFC/hB/WzQHtK8MoPoOxRZLk=; fh=DhboJXMA8RiOyOnXDTOJ2LpytVlFP9MzPKqZPfc6r3Y=; b=vAlD3WeurJpDW+EwnvvYY+EmrygThl4KfHRJ2gAQBfads7hIUw3I/l135hy9nqbBHV RbbOM8GesX8Z6AqPwDg+/Qvh7vvwPYFS4R6K7d5uylM7ZJ1IBFpyzKN+bTcmyWP/7lAK 5aGTE2pmEXs0eWLeAzNB53eOrkl85uRE2FJ/KYcB8+X1XRnFd5mCvXpEDxfgPSph9eGE fhAxrgTm7PNDrLbcCyKfrlfwlFCs7C1GO9U1RSyVWePUuxzCoxxB15nWLPIr0zpe0n0v lEfIdAnH29U1djo/c0A/WcZeM8yjr4xBAcjp187BS9NGO84dLyF2ofp7qUAmNG5E84tG 394Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SWG7IwiF; 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 k8-20020ac5cce8000000b004d40c32203asi689929vkn.319.2024.05.03.08.36.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2024 08:36:43 -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=SWG7IwiF; 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 1s2uxh-0002fQ-Se; Fri, 03 May 2024 11:36:37 -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 1s2uxe-0002dJ-ON for qemu-devel@nongnu.org; Fri, 03 May 2024 11:36:34 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2uxU-0002gu-RM for qemu-devel@nongnu.org; Fri, 03 May 2024 11:36:34 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a598e483ad1so201169466b.1 for ; Fri, 03 May 2024 08:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714750581; x=1715355381; 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=qelxLGP2VCXMcEaYFfotFC/hB/WzQHtK8MoPoOxRZLk=; b=SWG7IwiF0hlbTzKfHggGbvPMrDm2eq+V2hDWynWlf71l1HEMpkjkvJZ953/WpJNqvl sE+oKstxVoAHqapwzYgfF4yy35JfgxAM3LTLHaeVxPLJ6syCh7fVxTE6oHzZtOporS21 +vqts7ObvVFxBxmLmdUPI6Zx0fFrJ0IJdlI1OL4eRu2pGiIlg6Eczmc8WfELBedEKD16 glE/aT8RtC2ShGjCsH8OcoTThwW9KP5fE4HHWH2VsWhN+YadhZETQ6YrurgrFEHudGVv rG/uYkRztR+pbXEAEN099Paga7O4psHbPkaA0QNnkDD+mQQVsA/rm+ZjRR8CdWGmId62 jv9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714750581; x=1715355381; 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=qelxLGP2VCXMcEaYFfotFC/hB/WzQHtK8MoPoOxRZLk=; b=xNAkCdHc2+wOHNwwXsDgPFeATVhp15bppO9Ay4cWChYBxXe8Kj1UyPAL1vq3DMhcQZ X70oMhAESt28ZMgB/DXkNclnk8/cz7AQUnAQazV+yT7RO5nDPbY2aPB8oCKbwJ1ey2rR AYK6tgG150te4143BdpqeIimboUC49fyhljrjWO3t8B0uu+dMSYLDYOjkUrEITE97vKa 6p4IuSZyhcWXJwOKn3fMP6Yr3q9/g8NWKAtGOn6Ds4aW6XFmWt8iIEN/Vw81BAz2tx8j l5LKu6Jf24zePfxvHoiIOZk7Y9VcK8PldUL0PX9UenGH6f+3OVV+zq9c95TgCjmVs7JV 8FuQ== X-Gm-Message-State: AOJu0YwBEWSv+PWqH3RZikcaK4IwI5M5T9LD6RdTylTefGU3kI7dXfsD yttJcFkmnyjtS686CsYnsSlGNmoYa++ECoobAqF8WztJ2m3uzuVUJqSdt45q5H3GqIlOqsW4E65 I X-Received: by 2002:a50:cccf:0:b0:56e:2cfc:1d3d with SMTP id b15-20020a50cccf000000b0056e2cfc1d3dmr1662067edj.16.1714750580994; Fri, 03 May 2024 08:36:20 -0700 (PDT) Received: from m1x-phil.lan ([176.176.179.187]) by smtp.gmail.com with ESMTPSA id p4-20020a056402074400b00572b2ad900fsm1763494edy.46.2024.05.03.08.36.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 May 2024 08:36:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?V?= =?utf-8?q?olker_R=C3=BCmelin?= , Richard Henderson Subject: [PULL 01/14] accel/nvmm: Fix NULL dereference in nvmm_init_vcpu() Date: Fri, 3 May 2024 17:36:00 +0200 Message-ID: <20240503153613.38709-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240503153613.38709-1-philmd@linaro.org> References: <20240503153613.38709-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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é Reviewed-by: Richard Henderson Message-Id: <20240429091918.27429-3-philmd@linaro.org> --- 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;