From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 2D0CD3DDDA6 for ; Tue, 5 May 2026 07:37:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777966646; cv=none; b=FU1+vZYIM1jA1ZMIUTNuxsZP8Awe0SUlGfLThz+yMJOonpDmpKN0z8H8NYAePvF7ECtxAtgqDfPAJwhTcyJ+RDFOaWjcezn0QrooJTQxvn2qD/4qxHcYl0a8spAwnYMfporPJ1j6Rd2CCOVSdXsQhlUhNkHJTwgy0mZ6uVOV48c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777966646; c=relaxed/simple; bh=IJ8fOwbxwCTp9Ks6bWz1Vj41x0dRZq0kJUqRAWzOlM4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=EIadUbyB8teUifcPE0xI834DNZTWss40XbCXPHV4GNbnJ6tAMmJAgD6yRUAI5q2ypCbLQSGyFNPweHPLbIpFg102zZT+kQGqaNjRQtkZZ14Yz1H8eeEB4M4DEZA5pRX0eO8kenbSpekaN9ZVbC60N7MLgSzDc+Y8inClshpokEA= 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=e12KG5Hm; arc=none smtp.client-ip=209.85.210.171 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="e12KG5Hm" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-834f1075805so3268625b3a.2 for ; Tue, 05 May 2026 00:37:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777966643; x=1778571443; 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=i0DH8W9/s3GguFFjUkHHe27A9U//szz9TZ2MkEXFYvI=; b=e12KG5HmHD49c+V7L77KGUjuPCrGUR+KXMfMNtxeIOe0iqPeTvTuhUhincGVWJVSRp WlsA8UScVaKEb8o7sdYqYDpfIqG6ePKVnMiwyqD9Ir5EvGvcDP3G/CgbVC77QPfkh7k1 +OITiP2V9Vq+hcuhyT8+eMSE5P7bh8a6dO5a6508nOuIuNI9BzUbXAxeCTh0BfCGJxVY y5HsT+9YzdSZR4ERnFjS80KXZ+DX+RJO1+EZTBm6CEzvi3LQgiQY2xyyaRDn4wLZgzjP fi3tFGP8p3xkNLqqBsM4ONc8YT2H/m7qSNZseSDGqriEln9VL6t2sQDO7OaCJA9S67A4 Wk8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777966643; x=1778571443; 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=i0DH8W9/s3GguFFjUkHHe27A9U//szz9TZ2MkEXFYvI=; b=Qs/CouA9+NCLvQTAQxgAvN4I/iLPMD0szGIUmZn0aKtcDIedlZxva1g62DeNLyOUaq 0A9ao86Iosd2P+/KspncECx5Cd1J94u1Ox/LrEj+QmfCDBIpO2A5mw+wlKNy84N4vbJj tGu8ANH95PMmaWYG3qCVSjTiunFNYuLH3JY7ffCuZtj2pmaUHb6ZR6fTfL22nsdxUmYL IcXJbYkiV9w7FFP9p42k9PnWy3ENFKS6zk5KjjjzZCSz2F7pJ44FIE/Zb/Hm6bqa7Ypn +b0kFCVJfnXJJ3h8SXNcuvYupyd+IWX/DwwnKuxMCnt9N+jRz70KSlRkyqJ9QBsVGu1X Hkpg== X-Forwarded-Encrypted: i=1; AFNElJ9IkAiaW+Yka/iNizS0OzfrsFQJevZmxXn5QDhuvsPifSLsN4T3xsdUk/qrL5MQ7mGf3N7lOWzez3+UlRg=@vger.kernel.org X-Gm-Message-State: AOJu0YzXpDqjc+i+X+4GthCqYhQZT4HE6h6hCieRtT0KlrKC1YoDlpEO qR0UnGHvc4mTFyN+Ph+ErYkyQd53HMIElxZ/a1ob6vHWQmLNU27q8ewP X-Gm-Gg: AeBDiesYU3resRGyCSCRBrEPujrLVoYHe9WkInclZyTZlc8CjLTBtvSS5bvRQbA+Jm3 HfCC5CZySWOEwTYaYewxAU09WbTMQQMgks0nCXVPQmFRAZTlISsAZiGltcom+MauHx3oQCxA+Cs lLkNVcvfT2lSw1Suuwu2ZO2WyYGL/xoGciwRramksG+/oHE2cSQR3kKlbYDKAIWiCaWhcVIM9bF e5h4mDQB3qr5smw1BCl3UXY+zu5Lt7Hs5aadNEboCy7NlFPktfW2U0Adj/wWT/Qqk/zVKj+M4y9 z5OGyUPCdq5EUR1bDAQiGA8mWlx4knQl08E7D22ODuhS6r8sinJvZWq79Dt9Xa/4pzNifaKl5rq n6P6I9qEkzc1llPEU8ca/SxEqG4oUtfh6wo+3gM491OaYtudWVoA6BtXjijvATpAq0B0PWLl+Hc t+/hKjzoucjAaeW9e9rxO4KEiQMhm7xMSaWr4TN17uCHdu3kJUh3XheHYjb4J2+VVo/GvrsfNOe yvtG8JmI9OXdtoZX8dE4mkkT49aELIWVu5zV7dkFwupvg== X-Received: by 2002:a05:6a00:92a8:b0:835:6d99:3f94 with SMTP id d2e1a72fcca58-8356d9949f6mr9288842b3a.25.1777966643412; Tue, 05 May 2026 00:37:23 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83965c30ddasm1492602b3a.21.2026.05.05.00.37.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 00:37:22 -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: [PATCHv2] talitos: allocate channels with main struct Date: Tue, 5 May 2026 00:37:05 -0700 Message-ID: <20260505073705.8810-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@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. Signed-off-by: Rosen Penev --- v2: add check for of_property_read_u32 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..e1f009684216 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)) + num_channels = 0; + + 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