From nobody Tue Apr 7 14:36:49 2026 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (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 A02F81A9FBA for ; Fri, 13 Mar 2026 00:23:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773361409; cv=none; b=BiqkCO5QJ42VvGFdtGJ0RRDku8JBtuL38EZJJthw6unxloXW40nkmS3wYyNPXA9yDeD4rK/IPwzhMLkYmaMmjtK8P897QbGjh0IUHnV+Wnrxmh0xNL/WNpHDWrZjZF6U1BNVNVZK+3UupJer3EjvXDX0Mt5F009rCHjV1FdfE94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773361409; c=relaxed/simple; bh=DAOotS0+fJKT3Knk+MeZ7HSRumsv/xP9lPM/rU63+iE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CVTVH3+tZ48BDeIEw6oh9StPXsmaVPgX0FqcXZ9Vdfu4O6aVkhA29K+7u5APuJU4BI4QKlaq25cjmRHsm8OiJC1dXsCdV0KX0ZYBtddGnYYXw5bu1+JWm0S8LW20t9LKA6cHR31xFP8vAdnDJ4g/f+8T+RBhqfqUzo6T0bMipOY= 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=kBbm3S5X; arc=none smtp.client-ip=209.85.128.169 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="kBbm3S5X" Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-799569f6e9dso18090957b3.3 for ; Thu, 12 Mar 2026 17:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773361407; x=1773966207; 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=bpGg8KlAOke1kfXQdKS/v1oPTBpVb3phcbFoPsToyyw=; b=kBbm3S5XfkOimj5j68nNMgRHRssj72ZnCsTjJGIPBtmQ+uRo3fBIHz7BbTMChu1hV1 X10KojimkhYYp82RwZ3cKhnkFuxu+IJ51oECy6cJr2ntxYwzoCVtBvhFabfODfzUrobp gS/zg/q6fMz9gGS7v8aqFlqvL/PX2Ov41xnGzAkcSKOrP9HriaGICwQ+znLdEMJa9p2Z ggr3b5IEaboFi+v6dLG+jA/BMEexXxDS/kntRWV5BwvqgQCr1zTnV9k/hJg0+vj2hpSa fb9PYWrsgD+mOG/5SCYLRmL4Ov/LszwmqIJjbMnOfPW6wueVcz+SFhGqEzadpNo65K+J 58+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773361407; x=1773966207; 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=bpGg8KlAOke1kfXQdKS/v1oPTBpVb3phcbFoPsToyyw=; b=HkHBHAZzqGpn0johkherO7/c4MpEMXjUc5gIXPGMLva20yfy4+2RK3OkfxoozN0VzB SS+XZ6apKAIhNQH2G0ykMjUr6g3yOpRhbzwAGVr1hLuaDVE3Nvp1ipa45jfhpm34/KoR kTlpbw1+0cu5Wf2FnCjPzSZKiAkQay5uROg7YZ5Ftxh1rKFUozUgkMO2ouSlW4q7gTmE RGSL1b+ocXY4f3z12y3m7o6M7Hm3mK6JTpz5fCP9JA3GNiJ2KcdWslzlYxNmZKCvqHeV M3UWWzFSoQvMHqC4UCnrgWc1IbNbRVN/EW+W0sz3t9bzOCT7qoC8MUiS1VxcoWnHkhxK UoQA== X-Forwarded-Encrypted: i=1; AJvYcCWF4Teq3EkeQVw1mwp0Io2+GmMYyS8GeY6OHoqoe1M8oHAOgKxLJ+uYNRKMIUYpgt4fveYFIW02HAkMISM=@vger.kernel.org X-Gm-Message-State: AOJu0YzCUX0GzLqu5zA2KADUzujrp6czMrANG9CYBiBd/YnhUW0DsUIa 3G2/DTIlo5k4SpjfyejIN7ulbIA1QJEUxN8+KyJUEeZr4R8uRHh+LMfN X-Gm-Gg: ATEYQzzCRh2rhUkNkzynm9b4UapmIjVfJX3XQiAMxDtI76MdyFVrT48cj7mXWWyfvVI 0mVJcv5INmQEHBKfXEOXjVDmlw6+NDdfM4r0ayxnnr9P2j1uuCSjzoeS1Hp/7IcV1QZF50qLuX/ YbLzfUF7wX41FMunD2C/b5q4QUuCi/Imq+2eFYm01x/N7+tGuA+pFmQqZBzalmn/Q+pLjjt0T8n DvLARl+TKaiV94PuO890XAeZfNey+fdD/3yyvzPYm4/5Ue8EbBaRyNRq3CcVj3AxQsklm4+IWnL zibh0d73z5hymwGnp9lCm4sOZA12cp14qESZx0YiV//WLzWQOP9YXZHvHUflgS7szjSvAk7a+bs KkxKUP4vSNsSlKMrmfu+odhbapyUKYXZOwilc21qz3tgpedWnO5l3fRXyxiAdRpEdd0Wib3xqCD LI3R4mpU0SlsHngzDQ1R1ntLL+ENemc2OXIDn0DDBFSI6NFjSkr23yUw== X-Received: by 2002:a05:690c:ed5:b0:798:ff7e:96a6 with SMTP id 00721157ae682-79a1c23cd40mr16090467b3.63.1773361406680; Thu, 12 Mar 2026 17:23:26 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-64e65b67185sm152768d50.19.2026.03.12.17.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 17:23:26 -0700 (PDT) From: Rosen Penev To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Tomi Valkeinen , Luca Ceresoli , 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: atr: use kzalloc_flex Date: Thu, 12 Mar 2026 17:23:08 -0700 Message-ID: <20260313002308.119343-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" Convert kzalloc_obj + kcalloc to kzalloc_flex to save an allocation. Add __counted_by to get extra runtime analysis. Move counting variable assignment immediately after allocation as required by __counted_by. Signed-off-by: Rosen Penev Reviewed-by: Romain Gantois --- drivers/i2c/i2c-atr.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c index f9fcb4793aaf..b0aedcf0bf71 100644 --- a/drivers/i2c/i2c-atr.c +++ b/drivers/i2c/i2c-atr.c @@ -58,8 +58,8 @@ struct i2c_atr_alias_pool { =20 /* Protects aliases and use_mask */ spinlock_t lock; - u16 *aliases; unsigned long *use_mask; + u16 aliases[] __counted_by(size); }; =20 /** @@ -137,22 +137,16 @@ static struct i2c_atr_alias_pool *i2c_atr_alloc_alias= _pool(size_t num_aliases, b struct i2c_atr_alias_pool *alias_pool; int ret; =20 - alias_pool =3D kzalloc_obj(*alias_pool); + alias_pool =3D kzalloc_flex(*alias_pool, aliases, num_aliases); if (!alias_pool) return ERR_PTR(-ENOMEM); =20 alias_pool->size =3D num_aliases; =20 - alias_pool->aliases =3D kcalloc(num_aliases, sizeof(*alias_pool->aliases)= , GFP_KERNEL); - if (!alias_pool->aliases) { - ret =3D -ENOMEM; - goto err_free_alias_pool; - } - alias_pool->use_mask =3D bitmap_zalloc(num_aliases, GFP_KERNEL); if (!alias_pool->use_mask) { ret =3D -ENOMEM; - goto err_free_aliases; + goto err_free_alias_pool; } =20 alias_pool->shared =3D shared; @@ -161,8 +155,6 @@ static struct i2c_atr_alias_pool *i2c_atr_alloc_alias_p= ool(size_t num_aliases, b =20 return alias_pool; =20 -err_free_aliases: - kfree(alias_pool->aliases); err_free_alias_pool: kfree(alias_pool); return ERR_PTR(ret); @@ -171,7 +163,6 @@ static struct i2c_atr_alias_pool *i2c_atr_alloc_alias_p= ool(size_t num_aliases, b static void i2c_atr_free_alias_pool(struct i2c_atr_alias_pool *alias_pool) { bitmap_free(alias_pool->use_mask); - kfree(alias_pool->aliases); kfree(alias_pool); } =20 --=20 2.53.0