| Message ID | 20250215054431.55747-3-xueshuai@linux.alibaba.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | dmaengine: idxd: fix memory leak in error handling path | expand |
On 2/14/25 21:44, Shuai Xue wrote: > Memory allocated for engines is not freed if an error occurs during > idxd_setup_engines(). To fix it, free the allocated memory in the > reverse order of allocation before exiting the function in case of an > error. > > Fixes: 75b911309060 ("dmaengine: idxd: fix engine conf_dev lifetime") > Signed-off-by: Shuai Xue <xueshuai@linux.alibaba.com> > Reviewed-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Fenghua Yu <fenghuay@nvidia.com> > --- > drivers/dma/idxd/init.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c > index b85736fd25bd..4e47075c5bef 100644 > --- a/drivers/dma/idxd/init.c > +++ b/drivers/dma/idxd/init.c > @@ -277,6 +277,7 @@ static int idxd_setup_engines(struct idxd_device *idxd) > rc = dev_set_name(conf_dev, "engine%d.%d", idxd->id, engine->id); > if (rc < 0) { > put_device(conf_dev); > + kfree(engine); > goto err; > } > > @@ -290,7 +291,10 @@ static int idxd_setup_engines(struct idxd_device *idxd) > engine = idxd->engines[i]; > conf_dev = engine_confdev(engine); > put_device(conf_dev); > + kfree(engine); > } > + kfree(idxd->engines); > + > return rc; > } > Thanks. -Fenghua
diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c index b85736fd25bd..4e47075c5bef 100644 --- a/drivers/dma/idxd/init.c +++ b/drivers/dma/idxd/init.c @@ -277,6 +277,7 @@ static int idxd_setup_engines(struct idxd_device *idxd) rc = dev_set_name(conf_dev, "engine%d.%d", idxd->id, engine->id); if (rc < 0) { put_device(conf_dev); + kfree(engine); goto err; } @@ -290,7 +291,10 @@ static int idxd_setup_engines(struct idxd_device *idxd) engine = idxd->engines[i]; conf_dev = engine_confdev(engine); put_device(conf_dev); + kfree(engine); } + kfree(idxd->engines); + return rc; }
Memory allocated for engines is not freed if an error occurs during idxd_setup_engines(). To fix it, free the allocated memory in the reverse order of allocation before exiting the function in case of an error. Fixes: 75b911309060 ("dmaengine: idxd: fix engine conf_dev lifetime") Signed-off-by: Shuai Xue <xueshuai@linux.alibaba.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> --- drivers/dma/idxd/init.c | 4 ++++ 1 file changed, 4 insertions(+)