From patchwork Mon Nov 11 20:47:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thorsten Blum X-Patchwork-Id: 2009928 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=AHwC26w0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=150.107.74.76; helo=mail.ozlabs.org; envelope-from=srs0=aq0b=sg=vger.kernel.org=sparclinux+bounces-2623-patchwork-incoming=ozlabs.org@ozlabs.org; receiver=patchwork.ozlabs.org) Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XnMB02DLgz1xwF for ; Tue, 12 Nov 2024 07:50:00 +1100 (AEDT) Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4XnM9x4fCsz4x33 for ; Tue, 12 Nov 2024 07:49:57 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4XnM9x4Qj8z4x3J; Tue, 12 Nov 2024 07:49:57 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; arc=pass smtp.remote-ip=147.75.80.249 arc.chain=subspace.kernel.org ARC-Seal: i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1731358194; cv=pass; b=xoPnDE73Ri9Tyc46kmejCmZ2VuZW5+M2ccoYi/JbuSME7oLoxBmBOgaifvHyaPi9lu88CcaXj+ODgRXk07U4EF4jX4omNuS3M/9RAvqxO5VzXNflAudqsmq3dLppZ+Gl23srrjcOP9pU0PTTfftB2aizoQQzZZ4mYzmkOTq0DY6Lgqk5oVPBp7lCnLG+KziHXqBn14G1POcnj59efLXP3x8dvPQ4Rey0p/GrVssayiuXV9NM+vM6XsGMi0/nOaSZzneBxP6Dluc589SFHrhygKM3n+BT3iu4/8Qm2bzF6QtXFmpRgT7bcaCK/saCOP6tuBOIzrEc1NJu4KYC6+BQ8A== ARC-Message-Signature: i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1731358194; c=relaxed/relaxed; bh=bw/uAtfi/0ahqKcqeR+WxFJl39p2Qshd9Y7/NqgYqQM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TLVTRuJHKDnZnURTldBGlAwATuKag59J1a5jZ2aQHeSvi9sorhmagGLlvFUHr2MBLS1o4+xUdkHGOcsFym7HiNz2v+4Wu3NTrdXRCr0UN3ot290uGpRxrP1+YXvcJDn1YSPSe0g+1zqBecK5kfm7CIxS5HfKNWPl10cgWvkMhzQeT2Y9dfE4BgNRUaQKTaa1wJJfuOZ8TNMJ/rOoKFUUgoAMxBksSKkMP91io6TJZTuYjuZ7n+vyjBnW8saBEh72zOGKmG417ps4XAuxb7v4AJ0NCGVG01G5BhEDkxxbcVSQimTQfVV8GWj27vTi0Ad/mXCw04X5DKIZiJCrlvKnTA== 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=AHwC26w0; dkim-atps=neutral; spf=pass (client-ip=147.75.80.249; helo=am.mirrors.kernel.org; envelope-from=sparclinux+bounces-2623-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=AHwC26w0; dkim-atps=neutral Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.80.249; helo=am.mirrors.kernel.org; envelope-from=sparclinux+bounces-2623-patchwork-incoming=ozlabs.org@vger.kernel.org; receiver=ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [147.75.80.249]) (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 4XnM9s0TsQz4x33 for ; Tue, 12 Nov 2024 07:49:53 +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 am.mirrors.kernel.org (Postfix) with ESMTPS id 564361F250B2 for ; Mon, 11 Nov 2024 20:49:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 630CC1AB528; Mon, 11 Nov 2024 20:49:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="AHwC26w0" X-Original-To: sparclinux@vger.kernel.org Received: from out-174.mta0.migadu.com (out-174.mta0.migadu.com [91.218.175.174]) (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 68AD314F9F9 for ; Mon, 11 Nov 2024 20:49:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731358180; cv=none; b=Gysjx+yOBwkb+8ODt0ZrUsdMtMKsotrH1QpDZ0UQnIlahfRhmeFVKPhXuBgiqXjoOABE1gEcFH/tnSeBhai6VukOlivhSNRQN6t9t/pJqhzkWSU27tcpOBY0CFKXgxPgfybkRkMwdZ+d15b74jPiq8HHoKg/Q5wHaAuOIytrMms= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731358180; c=relaxed/simple; bh=D8s++4EnV2bNYvN5wrQ3WljRShbW0f+sEVQALGUlCUw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GtsrAed7Ck4T8zAnic8cXZqaRc2Q+yIjtTwamSAej4rga4iLsz5PYFNO2WubxMlrejL6Bw6H2wGV0UHs9crXI+XNkB8if4RYgnScHHR+HJ7W+Z4BkBQY3p5uKdg5Dxrct5M40L7U8SD8G1GIDm3K6+WblCijaqbF9WNhqnDI2lc= 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=AHwC26w0; arc=none smtp.client-ip=91.218.175.174 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=1731358176; 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=bw/uAtfi/0ahqKcqeR+WxFJl39p2Qshd9Y7/NqgYqQM=; b=AHwC26w0YLZfSoXPU1Nx7tXF+glc9a2JSyh08+xfwrZpt+xV0HJVmVcmgIbQN/ZjAYZUkW tdxIkN4BXVuAbCAgkywWoND65FSoxP1pqGQOr2kJk3UHp7VHJ0FUI1ttLkYDRoluCHxIxf FvNOmxvA8WmH/pV1ZR+fvRIq6UbKros= From: Thorsten Blum To: "David S. Miller" , Andreas Larsson , Thorsten Blum , Arnd Bergmann , Sam Ravnborg , Ingo Molnar , Thomas Gleixner Cc: linux-hardening@vger.kernel.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] sparc: Replace one-element array with flexible array member Date: Mon, 11 Nov 2024 21:47:21 +0100 Message-ID: <20241111204724.165263-2-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=-0.9 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_NONE, 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 were 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 Reviewed-by: Andreas Larsson --- Changes in v2: - Fix the number of mappings after feedback from Gustavo A. R. Silva - Link to v1: https://lore.kernel.org/r/20241111200155.164621-3-thorsten.blum@linux.dev/ --- 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), GFP_KERNEL); if (!hdesc) { printk(KERN_ERR "ldom_startcpu_cpuid: Cannot allocate "