mtd: rawnand: fsl_ifc: allocate shared ctrl with devm_kzalloc
Subsystems (2)
PATCH v2 1/1 mtd: rawnand: fsl_ifc: allocate shared ctrl with devm_kzalloc
Allocate the shared fsl_ifc_nand_ctrl structure against the controller device, which outlives all NAND child devices, so it is freed automatically. This drops the manual kfree() and the broken chip counter that was decremented in remove() but never incremented anywhere, leaking the structure and leaving the freed pointer in ctrl->nand on re-probe.
---
v2: rebase.
drivers/mtd/nand/raw/fsl_ifc_nand.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/mtd/nand/raw/fsl_ifc_nand.c +2 -13
@@ -50,7 +50,6 @@ struct fsl_ifc_nand_ctrl {unsigned int index;/* Pointer to next byte to 'read' */ unsigned int oob;/* Non zero if operating on OOB data */ unsigned int eccread;/* Non zero for a full-page ECC read */ -unsigned int counter;/* counter for the initializations */ unsigned int max_bitflips;/* Saved during READ0 cmd */ };
@@ -1033,15 +1032,13 @@ static int fsl_ifc_nand_probe(struct platform_device *dev)mutex_lock (&fsl_ifc_nand_mutex);if (!fsl_ifc_ctrl_dev->nand) { - ifc_nand_ctrl =kzalloc_obj (*ifc_nand_ctrl); + ifc_nand_ctrl =devm_kzalloc (fsl_ifc_ctrl_dev->dev,sizeof (*ifc_nand_ctrl), +GFP_KERNEL );if (!ifc_nand_ctrl) {mutex_unlock (&fsl_ifc_nand_mutex);return -ENOMEM ; } - ifc_nand_ctrl->read_bytes =0 ; - ifc_nand_ctrl->index =0 ; - ifc_nand_ctrl->addr =NULL ; fsl_ifc_ctrl_dev->nand = ifc_nand_ctrl;nand_controller_init (&ifc_nand_ctrl->controller);
@@ -1121,14 +1118,6 @@ static void fsl_ifc_nand_remove(struct platform_device *dev)nand_cleanup (chip);fsl_ifc_chip_remove (priv); - -mutex_lock (&fsl_ifc_nand_mutex); - ifc_nand_ctrl->counter--; -if (!ifc_nand_ctrl->counter) { - fsl_ifc_ctrl_dev->nand =NULL ; -kfree (ifc_nand_ctrl); - } -mutex_unlock (&fsl_ifc_nand_mutex); }static const struct of_device_id fsl_ifc_nand_match[] = {
Signature · 1 line
2.55.0
Miquel Raynal
maintainerQuoted 27 lines · Rosen Penev
Allocate the shared
fsl_ifc_nand_ctrlstructure against the controller device, which outlives all NAND child devices, so it is freed automatically. This drops the manualkfree()and the broken chip counter that was decremented inremove()but never incremented anywhere, leaking the structure and leaving the freed pointer inctrl->nandon re-probe.Assisted-by opencode:big-pickleSigned-off-by Rosen Penev <[email protected]>---
v2: rebase.drivers/mtd/nand/raw/fsl_ifc_nand.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)drivers/mtd/nand/raw/fsl_ifc_nand.c +0
-1@@ -50,7 +50,6 @@ struct fsl_ifc_nand_ctrl {unsigned int index;/* Pointer to next byte to 'read' */ unsigned int oob;/* Non zero if operating on OOB data */ unsigned int eccread;/* Non zero for a full-page ECC read */ -unsigned int counter;/* counter for the initializations */ unsigned int max_bitflips;/* Saved during READ0 cmd */ };
drivers/mtd/nand/raw/fsl_ifc_nand.c static int fsl_ifc_nand_probe(struct platform_device *dev) · line 1036
Quoted 6 lines
drivers/mtd/nand/raw/fsl_ifc_nand.c +2
-1@@ -1033,15 +1032,13 @@ static int fsl_ifc_nand_probe(struct platform_device *dev)mutex_lock (&fsl_ifc_nand_mutex);if (!fsl_ifc_ctrl_dev->nand) { - ifc_nand_ctrl =kzalloc_obj (*ifc_nand_ctrl); + ifc_nand_ctrl =devm_kzalloc (fsl_ifc_ctrl_dev->dev,sizeof (*ifc_nand_ctrl), +GFP_KERNEL );
This is a global object. I don't get why it's global. But it seems not relevant to tie with ctrl_dev->dev (see Sashiko report). Can you please go one step further in this cleanup?
Thanks,
Miquèl
Quoted 31 lines · Miquel Raynal
Quoted 28 lines · Rosen Penev
Allocate the shared
fsl_ifc_nand_ctrlstructure against the controller device, which outlives all NAND child devices, so it is freed automatically. This drops the manualkfree()and the broken chip counter that was decremented inremove()but never incremented anywhere, leaking the structure and leaving the freed pointer inctrl->nandon re-probe.Assisted-by opencode:big-pickleSigned-off-by Rosen Penev <[email protected]>---
v2: rebase.drivers/mtd/nand/raw/fsl_ifc_nand.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)drivers/mtd/nand/raw/fsl_ifc_nand.c +0
-1@@ -50,7 +50,6 @@ struct fsl_ifc_nand_ctrl {unsigned int index;/* Pointer to next byte to 'read' */ unsigned int oob;/* Non zero if operating on OOB data */ unsigned int eccread;/* Non zero for a full-page ECC read */ -unsigned int counter;/* counter for the initializations */ unsigned int max_bitflips;/* Saved during READ0 cmd */ };@@ -1033,15 +1032,13 @@ static int fsl_ifc_nand_probe(struct platform_device *dev)
Quoted 9 lines
drivers/mtd/nand/raw/fsl_ifc_nand.c static int fsl_ifc_nand_probe(struct platform_device *dev) · line 1036
Quoted 5 lines
drivers/mtd/nand/raw/fsl_ifc_nand.c +2
-1mutex_lock (&fsl_ifc_nand_mutex);if (!fsl_ifc_ctrl_dev->nand) { - ifc_nand_ctrl =kzalloc_obj (*ifc_nand_ctrl); + ifc_nand_ctrl =devm_kzalloc (fsl_ifc_ctrl_dev->dev,sizeof (*ifc_nand_ctrl), +GFP_KERNEL );This is a global object. I don't get why it's global. But it seems not relevant to tie with
ctrl_dev->dev(see Sashiko report). Can you please go one step further in this cleanup?
The problem is, that global comes from drivers/memory/fsl_ifc.c . Note the forward declaration in fsl_ifc_nand.c
I haven't had luck getting anything merged there.
Quoted 3 lines
Thanks,
Miquèl