From patchwork Fri Mar 1 20:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 209076 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp136441dyc; Fri, 1 Mar 2024 12:26:46 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWnCgG/BKpPnVg2HqsUvB9jjcAlIlSJ0BnI5AM3srN1Y8glR4FXgsJxmG/zIcLMuuVzoJ0s7TPvsbffx4VfuNOmnrLnUQ== X-Google-Smtp-Source: AGHT+IHnM6U355yNapDw+oxuUEsjNiIT2pefcotrvuJMhjNPhM6wmf6sVG4NIUx0fNcvuS0tSg5l X-Received: by 2002:a05:6358:89b:b0:17b:f233:988f with SMTP id m27-20020a056358089b00b0017bf233988fmr2880842rwj.5.1709324806274; Fri, 01 Mar 2024 12:26:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709324806; cv=pass; d=google.com; s=arc-20160816; b=sFzz6aJlgQSIx2HeWsQxrsLb8odRtVcB+XrvjAVpFjtrKkMso1HBZFjeAOyCGggl1a /5esu97b67EY2GAglq9iPtrYnL2Cu90mshfauMoB9BptB+ys2GaeyTxjuPEUIf7A7Ux6 Cq7bnSv//Gn1Jg8vM5W5rmaFfJhR6pl5IteyPbZ49U1QgaMEUkD/OBBlvG08PeUTaTfw 0fu6BrnYIh7qOktzVgbAr4FFdgZ/0G4rPDnrRwrB5bZLXRCJ1c1JOKz1OkpepzGsr85q HzGk7u9TXiLn88nmzAolgTxz2AXYPH8Xc+EPuhq8YLRVa+6Kmph4u/RFwyPqwIcpbZEH Ut0A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=r4uxZbt0qin0Wn8Pr+rE6EDCFD41pXx3sQye6WwUWzw=; fh=V54fARugIiZ6tdTdiooR2dAvxowyTQVi4FVuYlzFL90=; b=Zku6aKsiyeWBGlPMamYbALpjSMSrAh64kJ10sLweKfwCp/YwOh+p4XwYQ8061oOQ54 r4uRC8K9bKW3eTNi2pKuPC/QncPPVs1VFbRD41fYaSfjLM0UXPinrOs/o74w8LgauIOZ udC6TGQ3njx8BTv5xr9pVph7soNNB4xZXAnjl1mr4SD2NgMT8/gFHrj71IEBn3Qn1yG9 tmDX5/xc6Myhedcl4al/GH0XJc7egYfeEZqHKECbUt9vkfRqpPNdRDlo9BVh3SgluxA/ Fr9IjO5yldpp1s1fmS0/hjaH42/o+KY2iys1s0uuMmbT2TpCIVQDI2Qzn9aKPTYwFU7e 2gPQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=i6GOcPL8; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-89081-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89081-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id gh6-20020a05621429c600b00690353442f5si4181197qvb.115.2024.03.01.12.26.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 12:26:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-89081-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=i6GOcPL8; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-89081-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89081-ouuuleilei=gmail.com@vger.kernel.org" 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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 127861C22DC1 for ; Fri, 1 Mar 2024 20:26:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 63B933D97F; Fri, 1 Mar 2024 20:25:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="i6GOcPL8" Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 044593C689 for ; Fri, 1 Mar 2024 20:25:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709324753; cv=none; b=Q6F4jVhxQSLk/CuAAZ4STSEMDD9/9svTtaOCNgYpY5OKWr+WzHunnUD3uSkMdSg3KlMSArBpxe0erxx+yZ4jNGJPMDj9mIWH103cFYc02W7gdGE7yZUrW7Rk7tTVdNu4eE/J5ldwgomBIeBXpA7W4V6VhA2gJ/Cgx959x6A68uw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709324753; c=relaxed/simple; bh=r0GlreGLsYtbA/Nea/FJMUIpPOXUZxD98Y/U+q/kZ/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=C8DE90rJw6J4LJsXx+0vvScxRYcC8Sf9Qoxzoj+zWiIFvbxjdXRLPPKlwOL0j19go7EUDCNpgBluk6g3xD4lpxUvd0fci+fgRBTo+9MrubAvHsetEmRoOxOdpb7Umv8cwc1IjpGY01dXYRKqZstUr24Tmh3tSM8+JVXHm1+vdsg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=i6GOcPL8; arc=none smtp.client-ip=209.85.210.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6e45ef83c54so1660742a34.2 for ; Fri, 01 Mar 2024 12:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1709324751; x=1709929551; darn=vger.kernel.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=r4uxZbt0qin0Wn8Pr+rE6EDCFD41pXx3sQye6WwUWzw=; b=i6GOcPL8AT1LAVXkhE7YUVgaLtFy2ynvq0/1YkUBJArcYTcaZkv6pMXSXoHiagensk G7h0+i4TW0z6uNSqwrp4tX9krzlD9+3ppTYXmQR/1JpwqCD12PfGhwNaUdutGJN4pgzl oHC062+S1jK8DA2IZkB7H4dyLthluYAr/0PeoJAXJ2Be+HfbQ8DIw75OiqUsjPSp/g3x VerqdUwMuORqDfOwFkzqDZEcb475OVihaVC7rlNkaewqViRLEhR7z4CnljE4t7A+FEsJ wx4grYg7cNZwWKhhdjmcf0pNG5MiMWDuw88f5zbt1wMcDGtzxxAsByD8KEXwuX60Edmq z21Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709324751; x=1709929551; 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=r4uxZbt0qin0Wn8Pr+rE6EDCFD41pXx3sQye6WwUWzw=; b=BaflZagflUkTAHQiM8PHfOhAC1Xiu/HSU6guP+h5Icie0cIkN5XJroDN+oSx2Xrigd 4lsiXHSMhy3GhInKzJxHv2Wr/0t1fUEyFlNdrSQqup4Imb0fPz+WOaRfxjtkNclCWLQD I1o6WB03Lb0/8Ws05W+1KXgxTxd+qCVfOAm9pFvpxMEFT2BaNfgcziCqxgGk1YN1pKbQ 7CU32mHm5XQv1dXwkGOg7XdnsQdxqmRoGGqpxwdCQt1z0WGRoSNKSedJK8UXei+WyYgV ilUmu921U3dl5tGwJYL+dHAe4rbY3VCrjDM7uDzBZYDDlpNcmwK2CliHBQQI2w7lYiFO dqzg== X-Forwarded-Encrypted: i=1; AJvYcCUpU0sc5/OtT7QoKC2ezo2pv5PqzX3HlFFQNwyc3HwdFAc3s9+mVFhV0/A0clUEmHvK0LA6LzNskIqQiG5l+v3ickvVNMAh+oy1HwMD X-Gm-Message-State: AOJu0YxpzRWNHEFuj4hDBdgLYEUhRQi64zDUhDWitWNR0N478EaeuJsR 0RK9xlLutNdnX4wtuonEHCx+2H7BJPXsnRlsYRVTRs1jf7LEzytskRns2TcqVy8= X-Received: by 2002:a9d:6215:0:b0:6e2:baa2:42c8 with SMTP id g21-20020a9d6215000000b006e2baa242c8mr2925611otj.28.1709324751180; Fri, 01 Mar 2024 12:25:51 -0800 (PST) Received: from freyr.lechnology.com (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id f10-20020a9d6c0a000000b006e454aa54d1sm806213otq.56.2024.03.01.12.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 12:25:50 -0800 (PST) From: David Lechner To: Mark Brown Cc: David Lechner , Michael Hennerich , =?utf-8?q?Nuno_S=C3=A1?= , Kees Cook , "Gustavo A. R. Silva" , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Christophe JAILLET Subject: [PATCH 3/3] spi: axi-spi-engine: use struct_size() macro Date: Fri, 1 Mar 2024 14:25:20 -0600 Message-ID: <20240301-mainline-axi-spi-engine-small-cleanups-v1-3-241dfd2a79f7@baylibre.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240301-mainline-axi-spi-engine-small-cleanups-v1-0-241dfd2a79f7@baylibre.com> References: <20240301-mainline-axi-spi-engine-small-cleanups-v1-0-241dfd2a79f7@baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mailer: b4 0.12.4 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792356968433317071 X-GMAIL-MSGID: 1792356968433317071 This makes use of the struct_size() macro to calculate the size of the struct axi_spi_engine when allocating it. Suggested-by: Christophe JAILLET Signed-off-by: David Lechner Reviewed-by: Kees Cook --- drivers/spi/spi-axi-spi-engine.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index e801eed820df..9646764b0042 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -501,15 +502,13 @@ static irqreturn_t spi_engine_irq(int irq, void *devid) static int spi_engine_optimize_message(struct spi_message *msg) { struct spi_engine_program p_dry, *p; - size_t size; spi_engine_precompile_message(msg); p_dry.length = 0; spi_engine_compile_message(msg, true, &p_dry); - size = sizeof(*p->instructions) * (p_dry.length + 1); - p = kzalloc(sizeof(*p) + size, GFP_KERNEL); + p = kzalloc(struct_size(p, instructions, p_dry.length + 1), GFP_KERNEL); if (!p) return -ENOMEM;