From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 312DC3822B1 for ; Thu, 30 Apr 2026 22:11:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777587103; cv=none; b=twMuSzD743GOTQEOldaAZ8xHuYje3WVoEq6INoBG091W06KExIp4MuuRn8JAbl8LiQyNavUUxl6w1hZe2PR/fOgNM1H6Mh9tgJiZuktfgfufw564vpqQa8tx8AhNDQeGF+2grOgBHErTZGnSRUsW3dU7zzyIFgqv3W2cBazd7zY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777587103; c=relaxed/simple; bh=vFGv55dfkj0ETD0g0nqltAGLsOx/oLvtbrwX44RQX6I=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=q19za2IK0KzHxdUmc+rnDI3OtucIUzAlzH4itBhm+Ga3y0KDZ/MvoNzjeJIiog6h2A0XIaRWVNnM7sgeoxsBct88eEQxJXMNdcZ4nVoUSkVdTmFrcBfYiN1SOSoFPBVw5tHEiSYJ1emZQZEmVPD78JR+R7qCOhi+LAlpwLXtDFE= 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=R7Qe6JAS; arc=none smtp.client-ip=209.85.210.174 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="R7Qe6JAS" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-82cebbdbdccso881364b3a.1 for ; Thu, 30 Apr 2026 15:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777587101; x=1778191901; 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=+CyYpr5DG2wVXaggugKyiSvcVLQEXsc/QvDPZHxp5lw=; b=R7Qe6JASjtDSiB8xbVqqBe19ZACFgfEjFFile8iFLJ8mzXfBuBzuNDY69MxCnyQkjn 266HYjIwHgRQk7sMgBLcWD+d4U/6POwmZfIPWfUL/qzrfNiJoFUr9Yl89Yi2DMIxWezf F1MVW9ndvmjYxhohJ57oteOvgQJnvP5I6Nv0drwbpP6CYcyixR4ah/L7z0OSROvukNLa 6TJc3RabQmk6e4CVmyu29PxjL8GfVMwGx3QQU3af9Va3iAxq8nwpFbH3i2xJm5e7ukRF ER2MCgyQ4VUkldb5JuRtdq0l9OCCAy+xFBDsABs0eCi9HSD2tKB5eGWCwrNGVKLx5zsX Sw/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777587101; x=1778191901; 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=+CyYpr5DG2wVXaggugKyiSvcVLQEXsc/QvDPZHxp5lw=; b=fqnyQC5E454eq/3teHuYH0LuV7bKRCIEiySCSc4jPSmBA8w+2yekI/4c9/nWjOXyQh M3+n0Pl+aQp7EUaK8ze/JaGw7aMeJlVevYrdEUPrk006YpxyTsTGf0mwLjZhOXHzmhlD jvVPwyRIwwFnvMt8dJjmp+6UajfEK/QDA9YUCiq6THHjYYYWOl5gRMw2r0UgGQeMB7qY Ykwa4nA/csS4/gHM2KRSkupnJvIsbE5MPVqxBBkhSi43trz62DcW9D2QLzkVWbmXAPWp kskGRadzM1M0xA+YfrHLnik90GQmiWLlrlPKUl3ktqM91lR/q0+ELM9TFsKcg22ZOQ4B JNmQ== X-Gm-Message-State: AOJu0Yyam2osFXVCTQPbX8CtpJDZ5Dnz77yW3hAX/JcBnHmtEm7YIYnM g1KV47QQT5PWv2TXW/v01FziUKe8xEotwf00kctGLmRE/t8gBm7QoWT6pJjOMZdn X-Gm-Gg: AeBDievEhTVkWQP8BvpG++iTIsB1UGtrhHHZ2CRkmTEWS3pGezoM3/VopcKv0BS9l08 BD57l+6IpxHCg8YY+L68UxNJ0pEKZFcqRjAdtb1RqaBNMjx+mMqm+Xi9NROaOP9HfGB5LN8R/wK 4PjfNnRQ8CNlVdU1pqpJHbml/CMiY2yUET2RVDU+U9ddCuQGauYpHeE4hUyFNxvldlvDPsNUjgS bbXBSpWfelgj/R7mySUm8eGTwlb9k6TTYqPr1VIJYi1wnYppsyLbpLnBM9T5AtH/hBpzUVmOjn0 Gyvl9FTEZWWZy2A+l1F6htlleFLA0St+honG2k8YKtzVwm9+1bqcTHYEwoIT+qrJVa+psZ9cOPj 6oMyjgcteQ4PWu6TOXhsTvOrd8Brqn+btHTVGEFqMZwJmZfwpu7OARB2jJ2/qxaoHpOpY9nhYIy mpkDah9DqtraWgFVZT/PdB48LgY+ZJ83IHVLskIXB9iPEy32sSAYqK5VB8NwINB/TmFyCD5fR07 KLN6KsnaBQDVcEeEeGs4hvW3td3Uhe5RO551sz7Y9chDpV1SRZxV5/g X-Received: by 2002:a05:6a00:299b:b0:82c:1cd0:2f7e with SMTP id d2e1a72fcca58-8350017cb7amr4240028b3a.20.1777587101053; Thu, 30 Apr 2026 15:11:41 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515838b34sm626013b3a.4.2026.04.30.15.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 15:11:40 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Nishanth Menon , Tero Kristo , Santosh Shilimkar , Kees Cook , "Gustavo A. R. Silva" , linux-arm-kernel@lists.infradead.org (moderated list:TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TI...), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCH] firmware: ti_sci: simplify resource allocation Date: Thu, 30 Apr 2026 15:11:23 -0700 Message-ID: <20260430221123.79947-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 --- drivers/firmware/ti_sci.c | 7 +------ include/linux/soc/ti/ti_sci_protocol.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index e027a2bd8f26..04d99c1fafa1 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -3574,16 +3574,11 @@ devm_ti_sci_get_resource_sets(const struct ti_sci_handle *handle, bool valid_set = false; int i, ret, res_count; - res = devm_kzalloc(dev, sizeof(*res), GFP_KERNEL); + res = devm_kzalloc(dev, struct_size(res, desc, sets), GFP_KERNEL); if (!res) return ERR_PTR(-ENOMEM); res->sets = sets; - res->desc = devm_kcalloc(dev, res->sets, sizeof(*res->desc), - GFP_KERNEL); - if (!res->desc) - return ERR_PTR(-ENOMEM); - for (i = 0; i < res->sets; i++) { ret = handle->ops.rm_core_ops.get_range(handle, dev_id, sub_types[i], diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h index fd104b666836..7632bb11c862 100644 --- a/include/linux/soc/ti/ti_sci_protocol.h +++ b/include/linux/soc/ti/ti_sci_protocol.h @@ -599,7 +599,7 @@ struct ti_sci_handle { struct ti_sci_resource { u16 sets; raw_spinlock_t lock; - struct ti_sci_resource_desc *desc; + struct ti_sci_resource_desc desc[] __counted_by(sets); }; #if IS_ENABLED(CONFIG_TI_SCI_PROTOCOL) -- 2.54.0