net: mana: fix use-after-free in add_adev() error path
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 net: mana: fix use-after-free in add_adev() error path
From: Ruijie Li <[email protected]>
If auxiliary_device_add() fails, add_adev() jumps to add_fail and calls auxiliary_device_uninit(adev).
The auxiliary device has its release callback set to adev_release(), which frees the containing struct mana_adev. Since adev is embedded in struct mana_adev, the subsequent fall-through to init_fail and access to adev->id may result in a use-after-free.
Fix this by saving the allocated auxiliary device id in a local variable before calling auxiliary_device_add(), and use that saved id in the cleanup path after auxiliary_device_uninit().
--- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/microsoft/mana/mana_en.c +4 -2
@@ -3425,6 +3425,7 @@ static int add_adev(struct gdma_dev *gd, const char *name)struct auxiliary_device *adev;struct mana_adev *madev;int ret; +int id; madev =kzalloc_obj (*madev);if (!madev)
@@ -3434,7 +3435,8 @@ static int add_adev(struct gdma_dev *gd, const char *name) ret =mana_adev_idx_alloc ();if (ret <0 ) goto idx_fail; - adev->id = ret; + id = ret; + adev->id = id; adev->name = name; adev->dev.parent = gd->gdma_context->dev;
@@ -3460,7 +3462,7 @@ static int add_adev(struct gdma_dev *gd, const char *name)auxiliary_device_uninit (adev); init_fail: -mana_adev_idx_free (adev->id); +mana_adev_idx_free (id); idx_fail:kfree (madev);
Quoted 14 lines
From: Ruijie Li <[email protected]>
If
auxiliary_device_add()fails,add_adev()jumps toadd_failand callsauxiliary_device_uninit(adev).The auxiliary device has its release callback set to
adev_release(), which frees the containing structmana_adev. Since adev is embedded in structmana_adev, the subsequent fall-through toinit_failand access toadev->idmay result in a use-after-free.Fix this by saving the allocated auxiliary device id in a local variable before calling
auxiliary_device_add(), and use that saved id in the cleanup path afterauxiliary_device_uninit().
Quoted 10 lines
Fixes a69839d4327d ("net: mana: Add support for auxiliary device")Cc <[email protected]>Reported-by Yifan Wu <[email protected]>Reported-by Juefei Pu <[email protected]>Co-developed-by Yuan Tan <[email protected]>Signed-off-by Yuan Tan <[email protected]>Suggested-by Xin Liu <[email protected]>Tested-by Yuqi Xu<[email protected]>Signed-off-by LI Ruijie <[email protected]>Signed-off-by Ao Zhou <[email protected]>
This has been fixed in this earlier commit:
https://lore.kernel.org/all/[email protected]/
Thanks for helping
Long
Quoted 40 lines
--- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/net/ethernet/microsoft/mana/mana_en.c +1
-0@@ -3425,6 +3425,7 @@ static int add_adev(struct gdma_dev *gd, const char *name)struct auxiliary_device *adev;struct mana_adev *madev;int ret; +int id; madev =kzalloc_obj (*madev);if (!madev)drivers/net/ethernet/microsoft/mana/mana_en.c +2
-1@@ -3434,7 +3435,8 @@ static int add_adev(struct gdma_dev *gd, const char *name) ret =mana_adev_idx_alloc ();if (ret <0 ) goto idx_fail; - adev->id = ret; + id = ret; + adev->id = id; adev->name = name;adev->dev.parent = gd->gdma_context->dev; @@ -3460,7 +3462,7 @@ static int add_adev(struct gdma_dev *gd, const char *name) auxiliary_device_uninit(adev);
init_fail:drivers/net/ethernet/microsoft/mana/mana_en.c +1
-2-mana_adev_idx_free (adev->id); +mana_adev_idx_free (id); idx_fail:kfree (madev); --