From nobody Tue Apr 7 09:05:10 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.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 EA7831A5B8A for ; Fri, 13 Mar 2026 21:45:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773438352; cv=none; b=RjbeNDvBeYWzmKcah3xROTv4QgdqHWgW4yIAH+yjd2D+nJuoAedTSqWK4xgljDgO2PAIRRa8JXys1Z5Q6OmBQ+8ybZZyMdTSph7RGLWJRVVK2TSlNMFfgfG6/+qW0IPknI4bsSwYwIrl+xvnw+5IrLyCLBblYPM05cnVRiLIizI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773438352; c=relaxed/simple; bh=fUCa1Im5Nx6GDZdxGDBy42sj6zhaXr1u53PJlGFKT2c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LP2XoF4XlKsR1vnofzsxKPePsfIk0DSrzZkNzvVLa/6m6vM5aiOLGdWlFnaZAtLIwsHuPhBPlV+aY9UnVP6DsHY51jf1Rw1BsAHYAw5bVz99+HAKM7r3Sc6mvo2dpKlPHfygEJq5iI9ZpM9i0WPZjcE6PMROHxVLRQ8WKv3bzXQ= 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=F8QnlE8q; arc=none smtp.client-ip=209.85.214.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="F8QnlE8q" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2b042da3f11so570805ad.3 for ; Fri, 13 Mar 2026 14:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773438350; x=1774043150; 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=5qM0Rn19YlMsshQ//ye6aBEoZrk8JSgQPX0Fa7XAh7Q=; b=F8QnlE8qLRRe8Quu5as5TsxLJ6ik7cT9ynCjJmvG7K5AMzW0PkZ+X3H7sk6gEo+3VT F+BpNsMXgAcPve+39gewOynI7qZXOCrbrORtdXpIZU2lVj7jjOz7WmB3o0PkJyxmzWTU OESprBHlTA4VvofxCXAKLxBMHYh85Y9hay2Uvi4C47sk/wnngcNqzzACQ5aW6sJ5LhgR jI9BCXz3WpxH+v/lX3hvALqyqnPSNtQTf/uWaD7ZARHq1Whoxd5Z0RzaapsJpYGFImCf TKxffupaBe4dstmmdNgGyFp6o0lZNWlQCRPBFoQ/ozf2DmVJplpi1YXTJ16noJ9Wekns YrJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773438350; x=1774043150; 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=5qM0Rn19YlMsshQ//ye6aBEoZrk8JSgQPX0Fa7XAh7Q=; b=omJUCXWVc6822Kl2WoFrQzn+F9zcXeFyZvztkyDQekw87+BBXvlKQyuyaN+OZyLe7c HNp9rYxSMCU3liJcjWhtgRPhAWuBIiB8OBFgC0l8uZHhQtBUvq9iryhy9ph+Sdf9OpYp Ib7VNQOE5Krt5Z6DmZy9iJFL5BLhRXnLBTCAG/RF293mTrHvoKnDHEWRdSxQH37QRV3c yU8mTiUf4bWkNddnW/VyIjNL5lnOO1p9pGQlhzrWcu40IELsc4diWyVHTzdto0lT9KQ6 piJN0thQfgkzJK9d35nMoXkB2lekpKrnf0BesRoY97Jac/5AxKu+3s957GprwHOFOM9C Woyg== X-Gm-Message-State: AOJu0Yx+FZoRi5mZygNJ61F+1Fwo4FZD0avJCbkx6kYNWzqFchCuSSry LTYz1ZXF9ac6U8EtMa7bOOsGSzGf7MIPcPWDR8wP1guDa9nrkuoNaG/Oc6jpXUt+ X-Gm-Gg: ATEYQzy7el091eB7QzkCiJjcSCQezFzA+PXRg+VYF+h7DgmbTvP4um1k7zdKSbBmaDv Rm8OgD+XGkerefqO6OLQuAH4FId2dowxW5B1aXWgCL+virt2HFo8V7IZR87pwF1jkGeUFC1OvH9 +dZ0Z6hgzE4pyK7G43kGlrHSDhMnu1184kjonG7+sG9pFmSuYU5ef8h6Txcn8+QLNf1p2McbqAH waKNcsyaCj3Xm85mwVM9txLlL3qgu+VtvFDJANXmx+3V1sJDux2tc++Z9DYIu3RymY0TuT9vtjB QZxlN+T298WfBdGlj1YlT4kzzcapLI5w2kxt2/xUCwQRbgCMVkeDhn6Msi9+QR+/3/XqBChLcMz ghNcUE8XbbFe/H1LF/ktt0CglSFbRLz75MvNFFpQxH/mWjH2CKMA78Z6nb79ULTa9ZBQovUcQBI 1pOU3MPSxmZsOoi1kE0xhQZEFPU7a2UVArm4bm/2X84DwibSSLcN3gNu1x3xB/21+i X-Received: by 2002:a17:902:d490:b0:2ae:5671:7071 with SMTP id d9443c01a7336-2aecac738a7mr45936395ad.43.1773438349935; Fri, 13 Mar 2026 14:45:49 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece56c388sm39983395ad.11.2026.03.13.14.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 14:45:49 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Dinh Nguyen , Kees Cook , "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCH] firmware: stratix10-svc: kmalloc_array + kzalloc to flex Date: Fri, 13 Mar 2026 14:45:31 -0700 Message-ID: <20260313214531.4829-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use a flexible array member to combine allocations. Simplifies memory management. Add __counted_by for extra runtime analysis. Also move counting variable assignment up as required by __counted_by. Signed-off-by: Rosen Penev --- drivers/firmware/stratix10-svc.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-= svc.c index e9e35d67ef96..e28adbc25eb4 100644 --- a/drivers/firmware/stratix10-svc.c +++ b/drivers/firmware/stratix10-svc.c @@ -243,7 +243,6 @@ struct stratix10_async_ctrl { /** * struct stratix10_svc_controller - service controller * @dev: device - * @chans: array of service channels * @num_chans: number of channels in 'chans' array * @num_active_client: number of active service client * @node: list management @@ -253,13 +252,13 @@ struct stratix10_async_ctrl { * @svc: manages the list of client svc drivers * @sdm_lock: only allows a single command single response to SDM * @actrl: async control structure + * @chans: array of service channels * * This struct is used to create communication channels for service client= s, to * handle secure monitor or hypervisor call. */ struct stratix10_svc_controller { struct device *dev; - struct stratix10_svc_chan *chans; int num_chans; int num_active_client; struct list_head node; @@ -269,6 +268,7 @@ struct stratix10_svc_controller { struct stratix10_svc *svc; struct mutex sdm_lock; struct stratix10_async_ctrl actrl; + struct stratix10_svc_chan chans[] __counted_by(num_chans); }; =20 /** @@ -1901,7 +1901,6 @@ static int stratix10_svc_drv_probe(struct platform_de= vice *pdev) { struct device *dev =3D &pdev->dev; struct stratix10_svc_controller *controller; - struct stratix10_svc_chan *chans; struct gen_pool *genpool; struct stratix10_svc_sh_memory *sh_memory; struct stratix10_svc *svc =3D NULL; @@ -1929,23 +1928,16 @@ static int stratix10_svc_drv_probe(struct platform_= device *pdev) return PTR_ERR(genpool); =20 /* allocate service controller and supporting channel */ - controller =3D devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); + controller =3D devm_kzalloc(dev, struct_size(controller, chans, SVC_NUM_C= HANNEL), + GFP_KERNEL); if (!controller) { ret =3D -ENOMEM; goto err_destroy_pool; } =20 - chans =3D devm_kmalloc_array(dev, SVC_NUM_CHANNEL, - sizeof(*chans), GFP_KERNEL | __GFP_ZERO); - if (!chans) { - ret =3D -ENOMEM; - goto err_destroy_pool; - } - - controller->dev =3D dev; controller->num_chans =3D SVC_NUM_CHANNEL; + controller->dev =3D dev; controller->num_active_client =3D 0; - controller->chans =3D chans; controller->genpool =3D genpool; controller->invoke_fn =3D invoke_fn; INIT_LIST_HEAD(&controller->node); @@ -1962,16 +1954,16 @@ static int stratix10_svc_drv_probe(struct platform_= device *pdev) mutex_init(&controller->sdm_lock); =20 for (i =3D 0; i < SVC_NUM_CHANNEL; i++) { - chans[i].scl =3D NULL; - chans[i].ctrl =3D controller; - chans[i].name =3D (char *)chan_names[i]; - spin_lock_init(&chans[i].lock); - ret =3D kfifo_alloc(&chans[i].svc_fifo, fifo_size, GFP_KERNEL); + controller->chans[i].scl =3D NULL; + controller->chans[i].ctrl =3D controller; + controller->chans[i].name =3D (char *)chan_names[i]; + spin_lock_init(&controller->chans[i].lock); + ret =3D kfifo_alloc(&controller->chans[i].svc_fifo, fifo_size, GFP_KERNE= L); if (ret) { dev_err(dev, "failed to allocate FIFO %d\n", i); goto err_free_fifos; } - spin_lock_init(&chans[i].svc_fifo_lock); + spin_lock_init(&controller->chans[i].svc_fifo_lock); } =20 list_add_tail(&controller->node, &svc_ctrl); @@ -2015,7 +2007,7 @@ static int stratix10_svc_drv_probe(struct platform_de= vice *pdev) list_del(&controller->node); /* free only the FIFOs that were successfully allocated */ while (i--) - kfifo_free(&chans[i].svc_fifo); + kfifo_free(&controller->chans[i].svc_fifo); stratix10_svc_async_exit(controller); err_destroy_pool: gen_pool_destroy(genpool); --=20 2.53.0