dmaengine: idxd: Avoid unnecessary destruction of file_ida
Subsystems (2)
PATCH 1/1 dmaengine: idxd: Avoid unnecessary destruction of file_ida
file_ida is allocated during cdev open and is freed accordingly during cdev release. This sequence is guaranteed by driver file operations. Therefore, there is no need to destroy an already empty file_ida when the WQ cdev is removed.
Worse, ida_free() in cdev release may happen after destruction of file_ida per WQ cdev. This can lead to accessing an id in file_ida after it has been destroyed, resulting in a kernel panic.
Remove ida_destroy(&file_ida) to address these issues.
--- drivers/dma/idxd/cdev.c | 1 - 1 file changed, 1 deletion(-)
drivers/dma/idxd/cdev.c +0 -1
@@ -1272,7 +1272,6 @@ void idxd_wq_del_cdev(struct idxd_wq *wq)struct idxd_cdev *idxd_cdev; idxd_cdev = wq->idxd_cdev; -ida_destroy (&file_ida); wq->idxd_cdev =NULL ;cdev_device_del (&idxd_cdev->cdev,cdev_dev (idxd_cdev));put_device (cdev_dev (idxd_cdev));
Signature · 1 line
2.37.1
Quoted 9 lines · Fenghua Yu
file_idais allocated during cdev open and is freed accordingly during cdev release. This sequence is guaranteed by driver file operations. Therefore, there is no need to destroy an already emptyfile_idawhen the WQ cdev is removed.Worse,
ida_free()in cdev release may happen after destruction offile_idaper WQ cdev. This can lead to accessing an id infile_idaafter it has been destroyed, resulting in a kernel panic.
Quoted 5 lines
Remove
ida_destroy(&file_ida)to address these issues.Fixes e6fd6d7e5f0f ("dmaengine: idxd: add a device to represent the file opened")Signed-off-by Lijun Pan <[email protected]>Signed-off-by Fenghua Yu <[email protected]>
Quoted 16 lines
--- drivers/dma/idxd/cdev.c | 1 - 1 file changed, 1 deletion(-)drivers/dma/idxd/cdev.c +0
-1@@ -1272,7 +1272,6 @@ void idxd_wq_del_cdev(struct idxd_wq *wq)struct idxd_cdev *idxd_cdev; idxd_cdev = wq->idxd_cdev; -ida_destroy (&file_ida); wq->idxd_cdev =NULL ;cdev_device_del (&idxd_cdev->cdev,cdev_dev (idxd_cdev));put_device (cdev_dev (idxd_cdev));
Hi, Vinod,
Quoted 30 lines · Dave Jiang
Quoted 9 lines · Fenghua Yu
file_idais allocated during cdev open and is freed accordingly during cdev release. This sequence is guaranteed by driver file operations. Therefore, there is no need to destroy an already emptyfile_idawhen the WQ cdev is removed.Worse,
ida_free()in cdev release may happen after destruction offile_idaper WQ cdev. This can lead to accessing an id infile_idaafter it has been destroyed, resulting in a kernel panic.Quoted 5 lines
Remove
ida_destroy(&file_ida)to address these issues.Fixes e6fd6d7e5f0f ("dmaengine: idxd: add a device to represent the file opened")Signed-off-by Lijun Pan <[email protected]>Signed-off-by Fenghua Yu <[email protected]>Reviewed-by Dave Jiang <[email protected]>Quoted 11 lines
--- drivers/dma/idxd/cdev.c | 1 - 1 file changed, 1 deletion(-)drivers/dma/idxd/cdev.c +0
-0@@ -1272,7 +1272,6 @@ void idxd_wq_del_cdev(struct idxd_wq *wq)struct idxd_cdev *idxd_cdev;
Quoted 5 lines
drivers/dma/idxd/cdev.c void idxd_wq_del_cdev(struct idxd_wq *wq) · line 1277
Quoted 5 lines
drivers/dma/idxd/cdev.c +0
-1idxd_cdev = wq->idxd_cdev; -ida_destroy (&file_ida); wq->idxd_cdev =NULL ;cdev_device_del (&idxd_cdev->cdev,cdev_dev (idxd_cdev));put_device (cdev_dev (idxd_cdev));
I noticed this patch was not merged to upstream yet. The patch is still cleanly applied to upstream.
Could you please help merge this patch?
Thanks.
-Fenghua
Quoted 10 lines · Fenghua Yu
file_idais allocated during cdev open and is freed accordingly during cdev release. This sequence is guaranteed by driver file operations. Therefore, there is no need to destroy an already emptyfile_idawhen the WQ cdev is removed.Worse,
ida_free()in cdev release may happen after destruction offile_idaper WQ cdev. This can lead to accessing an id infile_idaafter it has been destroyed, resulting in a kernel panic.[...]
Applied, thanks!
[1/1] dmaengine: idxd: Avoid unnecessary destruction of file_ida
commit: 76e43fa6a456787bad31b8d0daeabda27351a480
Best regards,
Signature · 1 line
~Vinod