From patchwork Mon Nov 11 20:01:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thorsten Blum X-Patchwork-Id: 2009909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=ONsRDFrj; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=2404:9400:2221:ea00::3; helo=mail.ozlabs.org; envelope-from=srs0=1clr=sg=vger.kernel.org=sparclinux+bounces-2619-patchwork-incoming=ozlabs.org@ozlabs.org; receiver=patchwork.ozlabs.org) Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XnLBF4fw6z1xyG for ; Tue, 12 Nov 2024 07:05:09 +1100 (AEDT) Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4XnLB84Vn6z4wcn for ; Tue, 12 Nov 2024 07:05:04 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4XnLB84SK3z4x11; Tue, 12 Nov 2024 07:05:04 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; arc=pass smtp.remote-ip="2604:1380:40f1:3f00::1" arc.chain=subspace.kernel.org ARC-Seal: i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1731355501; cv=pass; b=p56hWkTR7dqZiK+hSn59FeLsDUoQW4r9J5FMeUpIejzzVhwYl6CRye9BBHsWSk+89FyyRcISDXmogyweANA6d+rBYF5iikaVskK//W/2FgcnQN0CLRBN441pgYVvHAyW3uxmpRW/zC6NvLFPhE2vtZ9BJyutswQGwAkmiN1qbpZwlWhmrbs6Hoe+3Zh0vi9biULEjDJpWb4vHYwZiv62aIZ1RYAMNnxjx6GeUa1EWh40JVVJsrGMzsftqtYw+ZdTl4Hc9yr06vE+6pHBB8Y9uHcaZq4OHiQE+b5YFuulZmvl3WqIWDsVz2MAsl7BexH1rCioJuy2HG3fOMNjNtzwGw== ARC-Message-Signature: i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1731355501; c=relaxed/relaxed; bh=KsasaxW/qgozhLdiFt3pZQYHUUwKcBSae38ptynT+Mo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=BcJmT1CQeaZ6eOwKC/aotX9F2dxYnEY4VWBqcw2L5PAjDhJOQDk9xncgg1NOeUUi/65c3d5Hrrh4yf2AfP1wBL1rz39KVkBhcWKw5VX2JHdkCsB9g8Nj40p+WJoGnD5G4P7mPEKrPVfvP6uhmVFq+JII/7ujvozpbekKNeEhaHp+A7TcJ8S0XpSLpZnAXhG1cw/ZsOW7xV1AeDAPJjI6EB7JJXdZMICTRXKLRaQYkFgRKKOyTmAiVEfDBnQiVnRxSHJ/osnFXnlxnFqBuxJJMtu7g9XFLzEVyMOEt3sg06dhHCfaGEKdcm9XOBX7pVZ1fduroB/cQI6kv8lmZYxszw== ARC-Authentication-Results: i=2; gandalf.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.dev; dkim=pass (1024-bit key; unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=ONsRDFrj; dkim-atps=neutral; spf=pass (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=sparclinux+bounces-2619-patchwork-incoming=ozlabs.org@vger.kernel.org; receiver=ozlabs.org) smtp.mailfrom=vger.kernel.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: gandalf.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=ONsRDFrj; dkim-atps=neutral Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=sparclinux+bounces-2619-patchwork-incoming=ozlabs.org@vger.kernel.org; receiver=ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [IPv6:2604:1380:40f1:3f00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by gandalf.ozlabs.org (Postfix) with ESMTPS id 4XnLB51cmrz4wcn for ; Tue, 12 Nov 2024 07:05:01 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id D0BAEB264E4 for ; Mon, 11 Nov 2024 20:03:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2F4DE1AB6DA; Mon, 11 Nov 2024 20:03:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="ONsRDFrj" X-Original-To: sparclinux@vger.kernel.org Received: from out-172.mta1.migadu.com (out-172.mta1.migadu.com [95.215.58.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4E2D1A9B3A for ; Mon, 11 Nov 2024 20:03:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731355391; cv=none; b=A54OhAPQYSTyYYgps0o2tnFS+RIwYy7PjxpqPHZzoFqdbW8qgcCsBv979g2MC938qGkbs7bC/hkJxFYCn9VsdfqX2ndCLrTDOxVLw9UjHnqt7YzKgJ4q60ehV0hU5NgGGxoh3N+amJamp04kbHzXEPIp5CPcCyWa3qixu2NvRhM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731355391; c=relaxed/simple; bh=vr7aqKztPjRfbUBA2SBRJfn/DGMSrphS3AcgsXHNO78=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VquxBdHw5Qr+vZ+ek3iVy4WVJcbVf6/6vSYpKSCZO3YyoJgGub1Lv4zQV2m8lLcc6r9qavnwNPtwiNCY46T1mJRO/ZBbcGf03lDogj0gyPihZzcv93xFZopKqpPraBFRI8ABvfqbRtQ3snCEHEgbvbuatMMVV5Fk5pbsuaPfrag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=ONsRDFrj; arc=none smtp.client-ip=95.215.58.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1731355381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=KsasaxW/qgozhLdiFt3pZQYHUUwKcBSae38ptynT+Mo=; b=ONsRDFrjiVcW0Izi/WW0/LeO4woNA3f2ejlkyOBga1zbTneq7DDyfQwNkVwoWSs04TYrSz wjAKTprkLWawYruspyoZ9sKQjb7NDn4rl6xEE0ReGb7Uo6+2aOGW90a8HiT6SOTj5Pn46h dwdOY87nCs1oAqkAD0CIZ0u6HkLENRo= From: Thorsten Blum To: "David S. Miller" , Andreas Larsson , Sam Ravnborg , Thomas Gleixner , Ingo Molnar , Arnd Bergmann Cc: linux-hardening@vger.kernel.org, Thorsten Blum , sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] sparc: Replace one-element array with flexible array member Date: Mon, 11 Nov 2024 21:01:53 +0100 Message-ID: <20241111200155.164621-3-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: sparclinux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-3.2 required=5.0 tests=ARC_SIGNED,ARC_VALID, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DMARC_PASS, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on gandalf.ozlabs.org Replace the deprecated one-element array with a modern flexible array member in the struct hvtramp_descr. Additionally, 15 unnecessary bytes are allocated for hdesc, but instead of fixing the parentheses in the open-coded version, use struct_size() to calculate the correct number of bytes. Link: https://github.com/KSPP/linux/issues/79 Signed-off-by: Thorsten Blum --- arch/sparc/include/asm/hvtramp.h | 2 +- arch/sparc/kernel/smp_64.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/sparc/include/asm/hvtramp.h b/arch/sparc/include/asm/hvtramp.h index 688ea43af0f5..ce2453ea4f2b 100644 --- a/arch/sparc/include/asm/hvtramp.h +++ b/arch/sparc/include/asm/hvtramp.h @@ -17,7 +17,7 @@ struct hvtramp_descr { __u64 fault_info_va; __u64 fault_info_pa; __u64 thread_reg; - struct hvtramp_mapping maps[1]; + struct hvtramp_mapping maps[]; }; void hv_cpu_startup(unsigned long hvdescr_pa); diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index e40c395db202..24d980220bf1 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c @@ -297,9 +297,7 @@ static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg, unsigned long hv_err; int i; - hdesc = kzalloc(sizeof(*hdesc) + - (sizeof(struct hvtramp_mapping) * - num_kernel_image_mappings - 1), + hdesc = kzalloc(struct_size(hdesc, maps, num_kernel_image_mappings - 1), GFP_KERNEL); if (!hdesc) { printk(KERN_ERR "ldom_startcpu_cpuid: Cannot allocate "