mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 02:17:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

spmi: use kzalloc_flex in main allocation

Browse Source 
Add a flexible array member to avoid indexing past the struct.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Rosen Penev
2026-03-26 19:41:43 -07:00
committed by Stephen Boyd
parent 0c766f0f08
commit 3443eec9c5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spmi/spmi.c
View File

@@ -450,7 +450,7 @@ struct spmi_controller *spmi_controller_alloc(struct device *parent,
if (WARN_ON(!parent))
return ERR_PTR(-EINVAL);
ctrl = kzalloc(sizeof(*ctrl) + size, GFP_KERNEL);
ctrl = kzalloc_flex(*ctrl, priv, size);
if (!ctrl)
return ERR_PTR(-ENOMEM);
@@ -459,7 +459,7 @@ struct spmi_controller *spmi_controller_alloc(struct device *parent,
ctrl->dev.bus = &spmi_bus_type;
ctrl->dev.parent = parent;
ctrl->dev.of_node = parent->of_node;
spmi_controller_set_drvdata(ctrl, &ctrl[1]);
spmi_controller_set_drvdata(ctrl, ctrl->priv);
id = ida_alloc(&ctrl_ida, GFP_KERNEL);
if (id < 0) {

2
include/linux/spmi.h
View File

@@ -76,6 +76,7 @@ void spmi_device_remove(struct spmi_device *sdev);
* @cmd: sends a non-data command sequence on the SPMI bus.
* @read_cmd: sends a register read command sequence on the SPMI bus.
* @write_cmd: sends a register write command sequence on the SPMI bus.
* @priv: array of private data.
*/
struct spmi_controller {
struct device dev;
@@ -85,6 +86,7 @@ struct spmi_controller {
u8 sid, u16 addr, u8 *buf, size_t len);
int (*write_cmd)(struct spmi_controller *ctrl, u8 opcode,
u8 sid, u16 addr, const u8 *buf, size_t len);
u8 priv[];
};
static inline struct spmi_controller *to_spmi_controller(struct device *d)