Received-SPF: pass (google.com: domain of linux-kernel+bounces-197960-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Erick Archer <erick.archer@outlook.com>
To: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>,
	Ian Rogers <irogers@google.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	"Liang, Kan" <kan.liang@linux.intel.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Kees Cook <keescook@chromium.org>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Bill Wendling <morbo@google.com>,
	Justin Stitt <justinstitt@google.com>,
	Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	Matthew Wilcox <mawilcox@microsoft.com>
Cc: Erick Archer <erick.archer@outlook.com>,
	x86@kernel.org,
	linux-perf-users@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-hardening@vger.kernel.org,
	llvm@lists.linux.dev
Subject: [PATCH v4 2/3] perf/x86/intel/uncore: Prefer struct_size over open coded arithmetic
Date: Sat,  1 Jun 2024 18:56:17 +0200
Message-ID:
 <AS8PR02MB72374D446ECC6BD0711A51DC8BFD2@AS8PR02MB7237.eurprd02.prod.outlook.com>
In-Reply-To: <20240601165618.10020-1-erick.archer@outlook.com>
References: <20240601165618.10020-1-erick.archer@outlook.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AS8PR02MB7237:EE_|GV2PR02MB9373:EE_
X-MS-Office365-Filtering-Correlation-Id: 06e3cf8f-f815-4923-d50d-08dc825bd450
X-Microsoft-Antispam:
	BCL:0;ARA:14566002|461199019|3412199016|440099019|1602099003|1710799017;
X-Microsoft-Antispam-Message-Info:
	YuYgWqoh+Seb/cgJb4cNATq3of1/0TqV2kAuRO9e3o6BgzAgNhC768tgSO2s99/OMr1B/SDcc2kdXyTd2/m9TYCSijShDJEKkTB9BYZbY7NO+R445Mi/IqiQl5gGLQ6IqNvVO9dCEc1P0To1YphL3APKGV9F40d4tv59+4SiaojVs35kGm7tJeJFGDd/XfQv7bKnxusJ8/6CFY8WcK1qM1Q2pPvGWSujAhz350n9dE8Pyu+4gp+qmSEqY+/1ii7i3VCX2RrNPh+365L0OFRF3v3kVHZiu7utjUpy+cR+YqrIUQAq7c37urxGvylx2wPO1/X8H1BEMSm4KEFcpQ3wmZFaEb+ZepsUuGDT3v96t1g0pzRcjvOkfag/iNQErwqpjSxpa/eSRHjQHeZsyd9486FwvLMFBQ3PXw9fm9HNXmPUygDZr7vAdwyLws/IHoOoH2AXHS7tgRpDR9CReN1iIVEP01DWmBXG6KRErZrTqHZn5V8BOe+VXgLIXoic5JQSck3Snl3rPrIEJmm4GKhfu8MLetBkvlzOjaF5tMMyEI3GB2YYeGwoK3wlARIWtcVKbo+n/v5tlEiUeHzIbQy1706HSUumvo8ulTCVbSrV5DpPaMXkbN87b3H+TFkfYJaVwzkFpPBIfIwx7unWhbJp9bbUThQZeYaBSVIgOHkoyGalpijHWBLnYa7NTRbOqwgnEsTWW494940cYnfn44Gi7w==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?Hs9pUZrkFjYMwtxcE4frcGDFtBXbenxyXdce7NRIk4Ya1i0FxP8yQYO1bsdZ?=
 =?us-ascii?Q?2CUymScDNiXPeHmajRuF4MiZGJq4qnH0VeYFE8HgnjeQ2Hx6sWK8+MU/Ith4?=
 =?us-ascii?Q?fsaKmxZhEarDrVqlkIed3dETGGLt+ktHCqB6APBIFu0WVKFlq04fLOE1gqGB?=
 =?us-ascii?Q?L+O85FvPsmPUjDUrQQaH5cjI+JNTwBViBrz2BX6VNuewpzu3HZ1H/TpTj3Mr?=
 =?us-ascii?Q?i3UOAWY+t7VH9pAqWmFZUmWP/cV5i8CavktbOZt2oRJMAGDjYATqiszsriTF?=
 =?us-ascii?Q?LNOSWc/WQULE6LGfHkWHorjHClH2M40mA3XZajOkrgpALocMlyjBVqTCzYxm?=
 =?us-ascii?Q?Tmel+nLqEmAu6gKoL47bBcGFa5LxuVCFxPJGwzVv/qesDKsIqIvFMJNt+6/J?=
 =?us-ascii?Q?0Su5QOvzmnvRGiRhA0WjchWpPdvUtYtgZbAvvbd5Vv67sSsbelmZ++mFy8mz?=
 =?us-ascii?Q?jW1FtPOe7YHh/T9I8afSxDxbIxLK3SPU2XdjOrS6KMOLnz3oBtYrP3g/Ei75?=
 =?us-ascii?Q?sp9fYzccTFJi6AZ5mv/EvT+g0dk6z2dyZ5R8rtNm9ypimm5enIm9tROjl5gK?=
 =?us-ascii?Q?Xo0EqeElrbjRo7KUMSSUYrBrNhUp0fQOg3UQ0QT90Ew8bO0bZJrc5RQ3VIZN?=
 =?us-ascii?Q?cNasMj/JYP8exztEGc0l3epIO462VWyQS06yXc7QEgLirxCDT+ckOVO33Xmn?=
 =?us-ascii?Q?CphAQ8rDh3T8xxE0O/j245r3ojvtusOCW3s84oxKV1SdPzrYOr4Rg2r0xJq+?=
 =?us-ascii?Q?ThRla+d/8lX1nJL1yu9suR8oBHUYIq5UH66yqBzeC4qr1jUWSOgchpgjTicp?=
 =?us-ascii?Q?g+/QEwcjBwnj1gLlpnBos7RdPvA/OFBVYCYeFi0taQ8gszXyGBMDrjaaKm3j?=
 =?us-ascii?Q?Fwdh2c+C6E5u3yr4NtNdh1jLqS1Y/ksioNW9fZxe4T21psZE/Ux/hv1FwIJE?=
 =?us-ascii?Q?fzudJ/Q9fuGhxjQw7qGDPQvww27EJKnsL+XzsBfHjNP1fcDF9ZIsMzV59u6B?=
 =?us-ascii?Q?YhvWbRaMBgj2QV5PmusUIPyc98LSOE+uotTI1m/8uhwRG6w9Qsads/xjW+Nd?=
 =?us-ascii?Q?9W3ugevX+hn1RJBdPr8hP2bVTHzSjOKtGXwGmKZZQ7gbGdUMwj2LH5veLJCh?=
 =?us-ascii?Q?hi6tbcHJfm4qNuGDUyORhVDKGNlBY6mAxaPP2pRmu/8AZtYH6PYWo9IkrWaT?=
 =?us-ascii?Q?/H00Yok0lmPk2n595ex+B8f8lFB3tj2vCcsQDET3fiwUFyIeH5Pz9rp/EOX6?=
 =?us-ascii?Q?6XWGYJ6pMK7DJfHCHFeF?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 06e3cf8f-f815-4923-d50d-08dc825bd450
X-MS-Exchange-CrossTenant-AuthSource: AS8PR02MB7237.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2024 16:56:49.6741
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR02MB9373

This is an effort to get rid of all multiplications from allocation
functions in order to prevent integer overflows [1][2].

As the "box" variable is a pointer to "struct intel_uncore_box" and
this structure ends in a flexible array:

struct intel_uncore_box {
	[...]
	struct intel_uncore_extra_reg shared_regs[];
};

the preferred way in the kernel is to use the struct_size() helper to
do the arithmetic instead of the calculation "size + count * size" in
the kzalloc_node() function.

This way, the code is more readable and safer.

This code was detected with the help of Coccinelle, and audited and
modified manually.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments [1]
Link: https://github.com/KSPP/linux/issues/160 [2]
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Erick Archer <erick.archer@outlook.com>
---
 arch/x86/events/intel/uncore.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index 419c517b8594..b0d518d752aa 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -350,12 +350,11 @@ static void uncore_pmu_init_hrtimer(struct intel_uncore_box *box)
 static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type,
 						 int node)
 {
-	int i, size, numshared = type->num_shared_regs ;
+	int i, numshared = type->num_shared_regs;
 	struct intel_uncore_box *box;
 
-	size = sizeof(*box) + numshared * sizeof(struct intel_uncore_extra_reg);
-
-	box = kzalloc_node(size, GFP_KERNEL, node);
+	box = kzalloc_node(struct_size(box, shared_regs, numshared), GFP_KERNEL,
+			   node);
 	if (!box)
 		return NULL;
 
-- 
2.25.1