Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bcachefs: Prefer struct_size over open coded arithmetic

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>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

authored by

Erick Archer and committed by
Kent Overstreet
3e489998 1fdb9685

+2 -3
+1 -1
fs/bcachefs/io_read.c
··· 174 174 if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_promote)) 175 175 return ERR_PTR(-BCH_ERR_nopromote_no_writes); 176 176 177 - op = kzalloc(sizeof(*op) + sizeof(struct bio_vec) * pages, GFP_KERNEL); 177 + op = kzalloc(struct_size(op, bi_inline_vecs, pages), GFP_KERNEL); 178 178 if (!op) { 179 179 ret = -BCH_ERR_nopromote_enomem; 180 180 goto err;
+1 -2
fs/bcachefs/journal_seq_blacklist.c
··· 141 141 if (!bl) 142 142 return 0; 143 143 144 - t = kzalloc(sizeof(*t) + sizeof(t->entries[0]) * nr, 145 - GFP_KERNEL); 144 + t = kzalloc(struct_size(t, entries, nr), GFP_KERNEL); 146 145 if (!t) 147 146 return -BCH_ERR_ENOMEM_blacklist_table_init; 148 147