Received-SPF: pass (google.com: domain of linux-kernel+bounces-98185-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Erick Archer <erick.archer@gmx.com>
To: Kent Overstreet <kent.overstreet@linux.dev>,
	Brian Foster <bfoster@redhat.com>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Kees Cook <keescook@chromium.org>
Cc: Erick Archer <erick.archer@gmx.com>,
	linux-bcachefs@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-hardening@vger.kernel.org
Subject: [PATCH v2] bcachefs: Prefer struct_size over open coded arithmetic
Date: Sun, 10 Mar 2024 12:02:26 +0100
Message-Id: <20240310110226.6366-1-erick.archer@gmx.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:JwKYqJuPPMo=;3Zx3bGf7tDqDsQJzmUIOrUtp13Y
 B9nVzkrtiSCLALgkQ1ZfCdfjxLUfC+asnVqjIUfXJ3KyJyFb3Gn+jIBE0FPmmRUMiNIVSk5hz
 DJLHQanyaYeAIsTnHtsF0iHaBwkiP54+1MTGSLXqyQ4g42Z846mMoTJe+1Uv2Aj3a6pAre5Q1
 EHHE+rEJKel2GMu4rPEqOu8tjNJTe045/irw8dVa8BSm2R6/Y2iqAmVoslZp3Xt93LCUHUI1Q
 /IqhcUH1bSn1hExcymfnvakqIZ9bosSUeWta619trRu03yW5OAtclZBtUZuWyHoHqMrPrmUc3
 zaLrS/sdZGdAskS9tuq1cTM0TWVAsksrrC2qTysaWxIVKfEa5O2wAvZH0ORitGO32XYyYzdHO
 chfvcEsarJf4RGWJ0bGDxvew0JuHhStzBw+hijEDJCQaCOHaI50AkJf343fRo4vLFIDL1h+9F
 TFir0JsSDd+EoTW69S8/++/sLcQqaXQFUpaJxjoYn1TC3C9Polq+1C+fbYc6/dv8Y+496Z/+9
 tK10XstzvtMIEMh0UUBRCcV1Pu47dHM0jUrNQf/dNrgYVs8va25VwfQRsUZ7AqlvLwzm7d3ny
 XUIhpsqTPyqsiDxmWmCy+slZS6PrTYGcQIWsBA63w11na/ks+NtrapebyFlI6XBpBSaLM9xor
 Nih5932npaGl22GI+pLcOXV7P7+Q5JVUXYFPa8CLK9zJh8LxnJRBgnR3c8Quszrv8kdFE2ITd
 ebFl6K8ulN+mxJKMAKwkSMTaTeiHWvcqYxkT4pj/E4CxgukTiYHnWt5YzWtpcTQ/GJaxIgCam
 YuFeb0cowD7n0ZJaI1IxmcKALQ6oDr9AxToilGTuz8ZF0=

This is an effort to get rid of all multiplications from allocation
functions in order to prevent integer overflows [1][2].

As the "op" variable is a pointer to "struct promote_op" and this
structure ends in a flexible array:

struct promote_op {
	[...]
	struct bio_vec bi_inline_vecs[];
};

and the "t" variable is a pointer to "struct journal_seq_blacklist_table"
and this structure also ends in a flexible array:

struct journal_seq_blacklist_table {
	[...]
	struct journal_seq_blacklist_table_entry {
		u64		start;
		u64		end;
		bool		dirty;
	}			entries[];
};

the preferred way in the kernel is to use the struct_size() helper to
do the arithmetic instead of the argument "size + size * count" in the
kzalloc() functions.

This way, the code is more readable and safer.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-=
coded-arithmetic-in-allocator-arguments [1]
Link: https://github.com/KSPP/linux/issues/160 [2]
Signed-off-by: Erick Archer <erick.archer@gmx.com>
=2D--
Changes in v2:
- Merge the two patches in one single patch (Kent Overstreet).

Previous versions:
v1 -> https://lore.kernel.org/linux-hardening/20240224145924.7468-1-erick.=
archer@gmx.com/
v1 -> https://lore.kernel.org/linux-hardening/20240224151658.8272-1-erick.=
archer@gmx.com/
=2D--
 fs/bcachefs/io_read.c               | 2 +-
 fs/bcachefs/journal_seq_blacklist.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/bcachefs/io_read.c b/fs/bcachefs/io_read.c
index dce136cd2271..01beab55c6b3 100644
=2D-- a/fs/bcachefs/io_read.c
+++ b/fs/bcachefs/io_read.c
@@ -174,7 +174,7 @@ static struct promote_op *__promote_alloc(struct btree=
_trans *trans,
 	if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_promote))
 		return ERR_PTR(-BCH_ERR_nopromote_no_writes);

-	op =3D kzalloc(sizeof(*op) + sizeof(struct bio_vec) * pages, GFP_KERNEL)=
;
+	op =3D kzalloc(struct_size(op, bi_inline_vecs, pages), GFP_KERNEL);
 	if (!op) {
 		ret =3D -BCH_ERR_nopromote_enomem;
 		goto err;
diff --git a/fs/bcachefs/journal_seq_blacklist.c b/fs/bcachefs/journal_seq=
_blacklist.c
index 024c9b1b323f..2c2490aa15fe 100644
=2D-- a/fs/bcachefs/journal_seq_blacklist.c
+++ b/fs/bcachefs/journal_seq_blacklist.c
@@ -165,8 +165,7 @@ int bch2_blacklist_table_initialize(struct bch_fs *c)
 	if (!bl)
 		return 0;

-	t =3D kzalloc(sizeof(*t) + sizeof(t->entries[0]) * nr,
-		    GFP_KERNEL);
+	t =3D kzalloc(struct_size(t, entries, nr), GFP_KERNEL);
 	if (!t)
 		return -BCH_ERR_ENOMEM_blacklist_table_init;

=2D-
2.25.1