From nobody Tue Apr 7 01:16:57 2026 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 7870612D21B for ; Tue, 17 Mar 2026 00:27:37 +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=1773707258; cv=none; b=H5YY02VPXFaA0NB1TOUWz7JVMBDrQOZV+L89joZsCHJTzh/s6MzFfidtNJSy9bVJOOQIXDJRrGIBohy9jlJ1hU5/nedX1QfUgJiDBLbulZC10aMSy4GDES51W/+u9ODZhS5y6dF3UxOjI2+90YpZc450lMvnb2Kp8BFTCI4Oyuw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773707258; c=relaxed/simple; bh=gNmjgpW/Y+P21Wq8CTMHqjQ/bWwEJX3LvBxNpqU5zVs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JBkSti0Pd170xQLrAlXjgPUtp5INV3uOLwRTT+faSR02bbHgkZRa34IH6Ix7sMN/E5CPHAdfqEuHgBmE0gfy/t/0Osf1DhiBDckjiP+eIZ2LuSJX4mcA5YRdi2wPf7UD/nUlAuaTYYUMwtvgRareZ+xoJihwdd6PDPv0HY+Fh0o= 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=nopC97FT; 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="nopC97FT" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-82985f42664so3358537b3a.0 for ; Mon, 16 Mar 2026 17:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773707257; x=1774312057; 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=cl3Hhb5H1W1bOTwoWwjPrvMCUzzs+o+s/sL0FfKCb8I=; b=nopC97FTM6i8BAwa3VutD749G2ZkfpA8S93A3cw0cO0XaiGNtuxv4Otph1Srjf9LrO mzANeb+Zfqs786w3gysMLAaQZkM+c2UZSZNKqGpjwSPAGkzjtA89n43yzg7t9aJTHv/C D8QLUUKBk3RkM5nMP8rOCtQb2Rg17O4mjO2XOj/tO5WmYlj8zXEcAL2Np1OoBVbQedh/ 8IkysXu1POsBM62UWM50lits1XcfZCeO90ibkGE+yHQXb/jF3G4XD/G1tuDlIA1uuFDk NOakRCh3jUoVSTaFxltJmNln15ul0RpjZIJ04JdjrAbpZgccT2K3XkoEoNa+V+CW3WTU MqBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773707257; x=1774312057; 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=cl3Hhb5H1W1bOTwoWwjPrvMCUzzs+o+s/sL0FfKCb8I=; b=tSSRFO46MQJJ+OMXNjQQkhGX+BBSh4KfXOB8tUj2dZedHIHkQb7yqIa7uT4pXPFuG7 i84hdMPResHyawtQ9MDKtLzooc8E2f7By3pAuSymD/R1H/4ZioAbeHm6d8TZe2Pdn2eu WE+7JwX0w6WE6yd7cKDYWSuLeM3dbty9tXwEMkfMDNYLj1ZPOfvSIIX1K/JjGhOe0L1n KuDpnV6+rIPTeVVRVMiv3vYToFZCQJ7lnNi+RpcwRdRVGIPUSoBmNWPgPxcFLqFFOjng 3eA8HV/IkJNgdJLCGbH4Jw5RIe0lmThKe5J2y2NrU8Pj9LDF5Mib3JR+03ur381AVw4s oPCQ== X-Forwarded-Encrypted: i=1; AJvYcCVZZjSGG6gePwAQONILPKhUFT5QQjzKlVo6qiG4p0WOLkp1SHMFs98I7TilvdyTbC+j7JaXFNnfZhKjOlA=@vger.kernel.org X-Gm-Message-State: AOJu0YwIBWMaCUlL0pcKcu04zffg6f8UDjapLeWK/xCM87QkgReRRNNy qx4aDtlIAMw1rh9Rcu8eV2rQ2iebf4L4xaJ+OaTwKQ/ew0fmvvHL8bN4 X-Gm-Gg: ATEYQzy4S3VKhmSHECiJuuHpNGBYSOjYfs41uMcstnf0LWksGSR725obYWUb+YURmNT v+G+rJhohVYdFgyB77Eh+NWXmv0sNDJzTbcK8mKX865yIgCSYHYNHElM18NXhs8i/n5RK9Cnaut VboEaut8m+odvjbbv8+3vEftEM/cziY3/c8F7omeL/yHnRSHKd0zawK5zniispJSzm4Eteir/IN 6Z04LFpEjE8T0+rpsHyc/7MSlxxWYto1o0t+Dr8MfA2vNZI8E7BSMwm8sxpfOP+LqS+aPJ8wLOI z8Hm95Z44XtCaRrOHWZoWt3pQIC/2c+IEtZAO0MS3dux4TxESmkIDZZsE6IJVu7wgtYb7QHI7VE fn3rfQrFxWr2hj9fZHBTUYiXnPaDe8miJuRdlzQKmbGM1pq7REuiAknKFpjdPXOEU2GZ9Cf2jKo 85M7LA9mQ71yuaShZ13JzQQ1EmhMaA/N+na+tmFjgYE1pNxQqm+jQCepc= X-Received: by 2002:a05:6a00:130f:b0:81f:50b1:51f2 with SMTP id d2e1a72fcca58-82a198ac3b2mr13377514b3a.41.1773707256696; Mon, 16 Mar 2026 17:27:36 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a07340518sm14720798b3a.34.2026.03.16.17.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 17:27:36 -0700 (PDT) From: Rosen Penev To: linux-i2c@vger.kernel.org Cc: Andi Shyti , 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] i2c: keba: simplify allocation Date: Mon, 16 Mar 2026 17:27:17 -0700 Message-ID: <20260317002717.70829-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 kzalloc and kcalloc into one allocation. Use __counted_by for extra runtime analysis. Move the counting variable assignment to right after allocation as required by __counted_by. Signed-off-by: Rosen Penev --- drivers/i2c/busses/i2c-keba.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-keba.c b/drivers/i2c/busses/i2c-keba.c index 9420c8b342b5..23ae8a609008 100644 --- a/drivers/i2c/busses/i2c-keba.c +++ b/drivers/i2c/busses/i2c-keba.c @@ -51,8 +51,8 @@ struct ki2c { void __iomem *base; struct i2c_adapter adapter; =20 - struct i2c_client **client; int client_size; + struct i2c_client *client[] __counted_by(client_size); }; =20 static int ki2c_inuse_lock(struct ki2c *ki2c) @@ -508,19 +508,18 @@ static int ki2c_probe(struct auxiliary_device *auxdev, const struct auxiliary_device_id *id) { struct device *dev =3D &auxdev->dev; + struct keba_i2c_auxdev *adev; struct i2c_adapter *adap; struct ki2c *ki2c; int ret; =20 - ki2c =3D devm_kzalloc(dev, sizeof(*ki2c), GFP_KERNEL); + adev =3D container_of(auxdev, struct keba_i2c_auxdev, auxdev); + ki2c =3D devm_kzalloc(dev, struct_size(ki2c, client, adev->info_size), GF= P_KERNEL); if (!ki2c) return -ENOMEM; - ki2c->auxdev =3D container_of(auxdev, struct keba_i2c_auxdev, auxdev); - ki2c->client =3D devm_kcalloc(dev, ki2c->auxdev->info_size, - sizeof(*ki2c->client), GFP_KERNEL); - if (!ki2c->client) - return -ENOMEM; - ki2c->client_size =3D ki2c->auxdev->info_size; + + ki2c->client_size =3D adev->info_size; + ki2c->auxdev =3D adev; auxiliary_set_drvdata(auxdev, ki2c); =20 ki2c->base =3D devm_ioremap_resource(dev, &ki2c->auxdev->io); --=20 2.53.0