Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mux: Convert mux_control_ops to a flex array member in mux_chip 

Convert mux_control_ops to a flexible array member at the end of the
mux_chip struct and add the __counted_by() compiler attribute to
improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
CONFIG_FORTIFY_SOURCE.

Use struct_size() to calculate the number of bytes to allocate for a new
mux chip and to remove the following Coccinelle/coccicheck warning:

  WARNING: Use struct_size

Use size_add() to safely add any extra bytes.

No functional changes intended.

Link: https://github.com/KSPP/linux/issues/83
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://lore.kernel.org/r/20250610104106.1948-2-thorsten.blum@linux.dev
Signed-off-by: Kees Cook <kees@kernel.org>
This commit is contained in:
Thorsten Blum 2025-06-10 12:40:59 +02:00 committed by Kees Cook
parent e04c78d86a
commit 4bfbc2691d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mux/core.c
View File

@ -98,13 +98,12 @@ struct mux_chip *mux_chip_alloc(struct device *dev,
if (WARN_ON(!dev || !controllers)) if (WARN_ON(!dev || !controllers))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
mux_chip = kzalloc(sizeof(*mux_chip) + mux_chip = kzalloc(size_add(struct_size(mux_chip, mux, controllers),
controllers * sizeof(*mux_chip->mux) + sizeof_priv),
sizeof_priv, GFP_KERNEL); GFP_KERNEL);
if (!mux_chip) if (!mux_chip)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
mux_chip->mux = (struct mux_control *)(mux_chip + 1);
mux_chip->dev.class = &mux_class; mux_chip->dev.class = &mux_class;
mux_chip->dev.type = &mux_type; mux_chip->dev.type = &mux_type;
mux_chip->dev.parent = dev; mux_chip->dev.parent = dev;

4
include/linux/mux/driver.h
View File

@ -56,18 +56,18 @@ struct mux_control {
/** /**
* struct mux_chip - Represents a chip holding mux controllers. * struct mux_chip - Represents a chip holding mux controllers.
* @controllers: Number of mux controllers handled by the chip. * @controllers: Number of mux controllers handled by the chip.
* @mux: Array of mux controllers that are handled.
* @dev: Device structure. * @dev: Device structure.
* @id: Used to identify the device internally. * @id: Used to identify the device internally.
* @ops: Mux controller operations. * @ops: Mux controller operations.
* @mux: Array of mux controllers that are handled.
*/ */
struct mux_chip { struct mux_chip {
unsigned int controllers; unsigned int controllers;
struct mux_control *mux;
struct device dev; struct device dev;
int id; int id;
const struct mux_control_ops *ops; const struct mux_control_ops *ops;
struct mux_control mux[] __counted_by(controllers);
}; };
#define to_mux_chip(x) container_of((x), struct mux_chip, dev) #define to_mux_chip(x) container_of((x), struct mux_chip, dev)