From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 463803E92BB for ; Wed, 6 May 2026 08:57:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778057842; cv=none; b=O9w2ITdP9EWeRgCKJ9nRjrmnsv8+m+mnWEQN0YEzhE0PT3jj9V3CjzRIawh51xb4cY/5EUjKHNiidwkmUrGSqDJFx3SvbVwtTld62LkW5z6aakJmUATAr+0HP6XqBRieQuf1vfhkOon9NDrDgvfWbi7fBKlOG8iolFpdSFyELwI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778057842; c=relaxed/simple; bh=cQLi0CLHrdudzOaWTKAoWJWK1hvleJMjSm+2UfxLbTc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OWtnvBiaCFLtsNrwORBdnq1zyW/mnQw/eqH4uheO900WrG0D3Ru+h7zZ2OlAJSank2m2ja02pyfoDE2rRuj6Os4lV8hptSq/pNuLzER4qhczWYEELypYxIqRQRa/+CHs9QiKD/+IwfnWLvEk/87W/F2N0s1Sbu81BVeLqgmNMjQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=J95gIPq5; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J95gIPq5" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-834f1075805so4154600b3a.2 for ; Wed, 06 May 2026 01:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778057831; x=1778662631; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ICj8WNtLmbLEAUfa33M8keUHm3CfftczvpYQJzguyto=; b=J95gIPq5t2Erp4ClUyuyn/kQ+GRQJibR1GRWoPO3mQF4E+9w2SNM6dMaMhStk2tyK8 WqM+IiiiZY7mql611alNjal3+YdYNNe48YL5lS3vmbvVuSW8nkDzdZGFSxaOEMJl8mz5 F4R2fXd/Fkwx9oBtaljd/T6yWj84+I6ZQA1LhGV11MKGuChzbxwqFLbEYhYMJzH0sr3x PCzpevCw9tBGGCssdzUi3zASA2UwyROOfbLo92imRb/FbbH0GttaHBS9PZ8Rq7UEV6RY 3XgbyaZtD86KPLCR/G5Xz0Ta8J//Drc9uS9GQNMLHjcROQm3gcDVGe0mMgSjy/zdosMQ xw4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778057831; x=1778662631; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ICj8WNtLmbLEAUfa33M8keUHm3CfftczvpYQJzguyto=; b=DMexrqyOmiOiV/+qNlD0UloNaUsvNOZ9zXyYPOBRTgMcRjc/aFGDd/KV9bzMJrZ26F w3iNKp57ZURqPfUSGB4WFVsj2R5PEQI8TjKmSzbRjZlM+EUGpsJR2loBCiJ5yMLya6XS zXeOmN78RouRjpuHCNICpBdZ3FQngfoY0RMqcx3Nujv9ebVGguny+uI0xYPgGlvqNv/x yZmRwQOzUga5fyVkL5i0eA3q4eFVAtiyd+jEKxEPCm3oU+vdqYmzsJrIfdkt5sT8dbQ0 coAJPofUc/2OYHC6nR+TQkH1+cLXx6bd2AekAnilePSFU/+0s+jnUr16qjOnfqtyBzTv oxhg== X-Gm-Message-State: AOJu0Yy0kr+B2T3tGMGRGW5Z/xiwJODlN9T246lo+pamzWj3KMYZtEcP qiaR8Acu8avFf03E6HkZjrlArTaPmC+jYHM3Fq/KPbK7i2/K6XgWBqtNRDoEceqR X-Gm-Gg: AeBDieubguFSmorN0OWEqTmW+XXj3TDGk0ce1dsLz4mgy/uSVQV0jBn7MO2a5DlgkFO S0IUG0MhnpEBcSJjI9NmYewB92qInsGt/LxNtIKWXCOOoYTA+LEXTTDzWFGTxwXRCp+Mlc6nG9f VXTPzJvlJQ4e79+E4KtI+P6J37G5bypLhka8Wd/e9qMzhuAFi68U5WY+pv1GWsLy3Qb8Pxi5iuc PAuVmaoSrXsJOKD0xj/yZ/pbLzJaFAe34xyffdULuiFjx0A6sR2PgQZoN3tycqI7jSy1gxQeafS ZHQpmvl5LoEQgwjNFTVg+qqh80p4+ayyHZg5TFJy1CJbk3YCEOSYi/DmLMp3O9Gdp4dtUlkO7hi A9qETCRviariMzqxBZCD4CsPQWiUTJaH+8DctF2NdhSLePkRkqOmH2QPYv78UrTcSPkjcNtASBA hjyMbcUOa1RdsMfT9OtEzVIKNP+mfVZX4wy9egN0A0djFtVYovXSRlcvCENGuE5OPJa+5JH4pNG 4E4v3wPm1ICVeCN9b2YI6P4aDmuEUkAbTwMseK/BLsQPg== X-Received: by 2002:a05:6a00:27a4:b0:838:a46:ce99 with SMTP id d2e1a72fcca58-83a5e457a1fmr2243116b3a.48.1778057831191; Wed, 06 May 2026 01:57:11 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-839679c7ba9sm4807974b3a.35.2026.05.06.01.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 01:57:10 -0700 (PDT) From: Rosen Penev To: linux-crypto@vger.kernel.org Cc: Herbert Xu , "David S. Miller" , Kees Cook , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCH] talitos: allocate channels with main struct Date: Wed, 6 May 2026 01:56:53 -0700 Message-ID: <20260506085653.1211263-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use a flexible array member to combine allocations. Add __counted_by for extra runtime analysis. Error in case of no channels as they are required. Signed-off-by: Rosen Penev --- v2: error when no channels drivers/crypto/talitos.c | 19 +++++++------------ drivers/crypto/talitos.h | 5 +++-- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index bc61d0fe3514..bd4cc06ee13c 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -3409,14 +3409,20 @@ static int talitos_probe(struct platform_device *ofdev) struct device *dev = &ofdev->dev; struct device_node *np = ofdev->dev.of_node; struct talitos_private *priv; + unsigned int num_channels; int i, err; int stride; struct resource *res; - priv = devm_kzalloc(dev, sizeof(struct talitos_private), GFP_KERNEL); + if (of_property_read_u32(np, "fsl,num-channels", &num_channels)) + return -EINVAL; + + priv = devm_kzalloc(dev, struct_size(priv, chan, num_channels), GFP_KERNEL); if (!priv) return -ENOMEM; + priv->num_channels = num_channels; + INIT_LIST_HEAD(&priv->alg_list); dev_set_drvdata(dev, priv); @@ -3436,7 +3442,6 @@ static int talitos_probe(struct platform_device *ofdev) } /* get SEC version capabilities from device tree */ - of_property_read_u32(np, "fsl,num-channels", &priv->num_channels); of_property_read_u32(np, "fsl,channel-fifo-len", &priv->chfifo_len); of_property_read_u32(np, "fsl,exec-units-mask", &priv->exec_units); of_property_read_u32(np, "fsl,descriptor-types-mask", @@ -3511,16 +3516,6 @@ static int talitos_probe(struct platform_device *ofdev) } } - priv->chan = devm_kcalloc(dev, - priv->num_channels, - sizeof(struct talitos_channel), - GFP_KERNEL); - if (!priv->chan) { - dev_err(dev, "failed to allocate channel management space\n"); - err = -ENOMEM; - goto err_out; - } - priv->fifo_len = roundup_pow_of_two(priv->chfifo_len); for (i = 0; i < priv->num_channels; i++) { diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h index 1a93ee355929..34b0b5fab7e7 100644 --- a/drivers/crypto/talitos.h +++ b/drivers/crypto/talitos.h @@ -139,8 +139,6 @@ struct talitos_private { */ unsigned int fifo_len; - struct talitos_channel *chan; - /* next channel to be assigned next incoming descriptor */ atomic_t last_chan ____cacheline_aligned; @@ -153,6 +151,9 @@ struct talitos_private { /* hwrng device */ struct hwrng rng; bool rng_registered; + + struct talitos_channel chan[] __counted_by(num_channels); + }; /* .features flag */ -- 2.54.0