From patchwork Tue Sep 10 11:25:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 1983152 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X31cL6hY9z1y1l for ; Tue, 10 Sep 2024 21:26:26 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1snz0l-00053z-6r; Tue, 10 Sep 2024 11:26:19 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1snz0i-00052P-Hj for kernel-team@lists.ubuntu.com; Tue, 10 Sep 2024 11:26:16 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 5237E3F2F1 for ; Tue, 10 Sep 2024 11:26:16 +0000 (UTC) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-718d6ad6105so5979249b3a.1 for ; Tue, 10 Sep 2024 04:26:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725967574; x=1726572374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ziqdO39AO9k2nfMWFolbz2ABqgbtNOgD/kn0heuY5k4=; b=w6t9JAHpyG5DW79R3V5WhFMuq7FjxKcbjpYLTdGYWvDOHE+F/A1VkCK0Zs5u7SLeMb 6iYO3UvdKxqps7glQSY2yBmSx/sEIjR7OMKByoLDTSVz2iaXsm+ZCzp5Wg6aEy8UCDBy BWHze7tyToY0EaaDIhznjRnNHAk1D2z4C8U/SN1iP4sUSfWGYjjK8lCbYGW8FOs/tXCw w9YGaFw3H+X7xUatVGrbboybwnCY/KryZMRDVOwlej2SRBqyHxssDcR0u4LFUuYAWuvp fBvPMyH1W74eEUemVnm7U9DnaKmVQXY6h5mFX08F+8SHUwHEijPKNgOLp7YQc6hA9dNk dWwA== X-Gm-Message-State: AOJu0YwdXm57JfnNdWnvOW56uTtFLwOvH9yaFNHhH8JcH1AQ1XWiWZZc zcZXy71dUr54zKSuE51FyaxXM/nupO4UyMpllxm4xgUf0aYMGYsULOtXqXXWUE82oxqdFHxnbjq SA80t9FY533GrQyk7ojEoHkyIypX9iBkb30LjYrH4g/rxMbL5OIbrd27cDjJGOtlZ6FY6JsL//D lr6WE+vTH1FQ== X-Received: by 2002:a05:6a21:1707:b0:1ce:cbcf:aaa9 with SMTP id adf61e73a8af0-1cf5e1b62f3mr546748637.36.1725967574635; Tue, 10 Sep 2024 04:26:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFunV4OUbf1yP0JUUIIkan9AgTHTB0FIcQBrHIxmBCLKBCKneL/jVYGxQ51VVNKOwT2hmd8Fg== X-Received: by 2002:a05:6a21:1707:b0:1ce:cbcf:aaa9 with SMTP id adf61e73a8af0-1cf5e1b62f3mr546716637.36.1725967574124; Tue, 10 Sep 2024 04:26:14 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:959:86f5:52c1:2a4c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7d8256da131sm5539874a12.70.2024.09.10.04.26.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 04:26:13 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 2/2] cpufreq: brcmstb-avs-cpufreq: ISO C90 forbids mixed declarations Date: Tue, 10 Sep 2024 20:25:44 +0900 Message-ID: <20240910112550.1144379-3-koichiro.den@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240910112550.1144379-1-koichiro.den@canonical.com> References: <20240910112550.1144379-1-koichiro.den@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Portia Stephens There is a compile warning because a NULL pointer check was added before a struct was declared. This moves the NULL pointer check to after the struct is declared and moves the struct assignment to after the NULL pointer check. Fixes: f661017e6d32 ("cpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return value") Signed-off-by: Portia Stephens Acked-by: Florian Fainelli Signed-off-by: Viresh Kumar (backported from fa7bd98f3c8b33fb68c6b2bc69cff32b63db69f8) [koichiroden: Adjusted context due to missing commit a48ac1c9f294 ("cpufreq: brcmstb-avs: fix imbalance of cpufreq policy refcount")] CVE-2024-27051 Signed-off-by: Koichiro Den --- drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c index 1302e1900dcb..75f02058efaf 100644 --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c @@ -457,9 +457,12 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv) static unsigned int brcm_avs_cpufreq_get(unsigned int cpu) { struct cpufreq_policy *policy = cpufreq_cpu_get(cpu); + struct private_data *priv; + if (!policy) return 0; - struct private_data *priv = policy->driver_data; + + priv = policy->driver_data; return brcm_avs_get_frequency(priv->base); }