diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2022-09-15 13:30:58 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-09-21 22:12:06 +0200 |
| commit | b7af938f4379a884f15713319648a7653497a907 (patch) | |
| tree | 42a102bcb5b1d9b90524ec5006a28e6148b015d7 | |
| parent | i2c: mlxbf: Fix frequency calculation (diff) | |
| download | linux-b7af938f4379a884f15713319648a7653497a907.tar.xz linux-b7af938f4379a884f15713319648a7653497a907.zip | |
i2c: mux: harden i2c_mux_alloc() against integer overflows
A couple years back we went through the kernel an automatically
converted size calculations to use struct_size() instead. The
struct_size() calculation is protected against integer overflows.
However it does not make sense to use the result from struct_size()
for additional math operations as that would negate any safeness.
Fixes: 1f3b69b6b939 ("i2c: mux: Use struct_size() in devm_kzalloc()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Peter Rosin <peda@axentia.se>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
| -rw-r--r-- | drivers/i2c/i2c-mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 774507b54b57..313904be5f3b 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -243,9 +243,10 @@ struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent, int (*deselect)(struct i2c_mux_core *, u32)) { struct i2c_mux_core *muxc; + size_t mux_size; - muxc = devm_kzalloc(dev, struct_size(muxc, adapter, max_adapters) - + sizeof_priv, GFP_KERNEL); + mux_size = struct_size(muxc, adapter, max_adapters); + muxc = devm_kzalloc(dev, size_add(mux_size, sizeof_priv), GFP_KERNEL); if (!muxc) return NULL; if (sizeof_priv) |