Commit b7af938f authored by Dan Carpenter's avatar Dan Carpenter Committed by Wolfram Sang

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: 1f3b69b6 ("i2c: mux: Use struct_size() in devm_kzalloc()")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarPeter Rosin <peda@axentia.se>
Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 37f071ec
...@@ -243,9 +243,10 @@ struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent, ...@@ -243,9 +243,10 @@ struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent,
int (*deselect)(struct i2c_mux_core *, u32)) int (*deselect)(struct i2c_mux_core *, u32))
{ {
struct i2c_mux_core *muxc; struct i2c_mux_core *muxc;
size_t mux_size;
muxc = devm_kzalloc(dev, struct_size(muxc, adapter, max_adapters) mux_size = struct_size(muxc, adapter, max_adapters);
+ sizeof_priv, GFP_KERNEL); muxc = devm_kzalloc(dev, size_add(mux_size, sizeof_priv), GFP_KERNEL);
if (!muxc) if (!muxc)
return NULL; return NULL;
if (sizeof_priv) if (sizeof_priv)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment