Skip to contentSkip to conversation

net: mana: fix use-after-free in add_adev() error path

PATCH In review Ao Zhou 2 participants 2 messages Apr 12 – Apr 13 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Ao Zhou

author
#1 lore raw

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().

Fixes a69839d4327d ("net: mana: Add support for auxiliary device")
---
 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
index 9017e806ecda..dca62fb9a3a9 100644
@@ -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);
#2 lore raw
Quoted 14 lines

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().

Quoted 10 lines
Fixes a69839d4327d ("net: mana: Add support for auxiliary device")

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
index 9017e806ecda..dca62fb9a3a9 100644
@@ -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);
--