Skip to contentSkip to conversation

devlink: double free in devlink_resource_fill()

PATCH In review Dan Carpenter 2 participants 2 messages Sep 21, 2018 – Sep 23, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 devlink: double free in devlink_resource_fill()

Smatch reports that devlink_dpipe_send_and_alloc_skb() frees the skb on error so this is a double free. We fixed a bunch of these bugs in commit 7fe4d6dcbcb4 ("devlink: Remove redundant free on error path") but we accidentally overlooked this one.

Fixes d9f9b9a4d05f ("devlink: Add support for resource abstraction")
net/core/devlink.c +1 -2
index 65fc366a78a4..8c0ed225e280 100644
@@ -2592,7 +2592,7 @@ static int devlink_resource_fill(struct genl_info *info,
 	if (!nlh) {
 		err = devlink_dpipe_send_and_alloc_skb(&skb, info);
 		if (err)
-			goto err_skb_send_alloc;
+			return err;
 		goto send_done;
 	}
 	return genlmsg_reply(skb, info);
@@ -2600,7 +2600,6 @@ static int devlink_resource_fill(struct genl_info *info,
 nla_put_failure:
 	err = -EMSGSIZE;
 err_resource_put:
-err_skb_send_alloc:
 	nlmsg_free(skb);
 	return err;
 }
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Fri, Sep 21, 2018 at 10:07:55AM CEST, [email protected] wrote:

Smatch reports that devlink_dpipe_send_and_alloc_skb() frees the skb on error so this is a double free. We fixed a bunch of these bugs in commit 7fe4d6dcbcb4 ("devlink: Remove redundant free on error path") but we accidentally overlooked this one.

Fixes d9f9b9a4d05f ("devlink: Add support for resource abstraction")