drivers/base/node: Fix double free in register_one_node()
Subsystems (2)
PATCH 1/1 drivers/base/node: Fix double free in register_one_node()
When device_register() fails in register_node(), it calls put_device(&node->dev). This triggers node_device_release(), which calls kfree(to_node(dev)), thereby freeing the entire node structure.
As a result, when register_node() returns an error, the node memory has already been freed. Calling kfree(node) again in register_one_node() leads to a double free.
This patch removes the redundant kfree(node) fromregister_one_node() to prevent the double free.
--- drivers/base/node.c | 1 - 1 file changed, 1 deletion(-)
drivers/base/node.c +0 -1
@@ -885,7 +885,6 @@ int register_one_node(int nid) error =register_node (node_devices[nid], nid);if (error) { node_devices[nid] =NULL ; -kfree (node);return error; }
Signature · 1 line
2.51.0
Quoted 23 lines · Donet Tom
When
device_register()fails inregister_node(), it callsput_device(&node->dev). This triggersnode_device_release(), which calls kfree(to_node(dev)), thereby freeing the entire node structure.As a result, when
register_node()returns an error, the node memory has already been freed. Calling kfree(node) again inregister_one_node()leads to a double free.This patch removes the redundant kfree(node) from
register_one_node()to prevent the double free.Fixes 786eb990cfb7 ("drivers/base/node: handle error properly in register_one_node()")Signed-off-by Donet Tom <[email protected]>--- drivers/base/node.c | 1 - 1 file changed, 1 deletion(-)drivers/base/node.c +0
-0
drivers/base/node.c int register_one_node(int nid) · line 890
Quoted 7 lines
drivers/base/node.c +0
-1@@ -885,7 +885,6 @@ int register_one_node(int nid) error =register_node (node_devices[nid], nid);if (error) { node_devices[nid] =NULL ; -kfree (node);return error; }
Yes, that matches what other users (staring at mm/memory-tiers.c) do.
I wonder if we should just inline register_node() into register_one_node().
Then it's clearer that we perform a put_device() already in there.
On top of that, we could then just s/register_one_node/register_node/
And then we could do a similar cleanup for unregister_one_node / unregister_node where I don't consider the split function really valuable.
Signature · 3 lines
Cheers David / dhildenb
David Hildenbrand
Acked-byQuoted 19 lines · David Hildenbrand
Quoted 18 lines · Donet Tom
When
device_register()fails inregister_node(), it callsput_device(&node->dev). This triggersnode_device_release(), which calls kfree(to_node(dev)), thereby freeing the entire node structure.As a result, when
register_node()returns an error, the node memory has already been freed. Calling kfree(node) again inregister_one_node()leads to a double free.This patch removes the redundant kfree(node) from
register_one_node()to prevent the double free.Fixes 786eb990cfb7 ("drivers/base/node: handle error properly in register_one_node()")Signed-off-by Donet Tom <[email protected]>--- drivers/base/node.c | 1 - 1 file changed, 1 deletion(-)
Quoted 14 lines
drivers/base/node.c int register_one_node(int nid) · line 890
Quoted 12 lines
drivers/base/node.c +0
-1@@ -885,7 +885,6 @@ int register_one_node(int nid) error =register_node (node_devices[nid], nid);if (error) { node_devices[nid] =NULL ; -kfree (node);return error; }Yes, that matches what other users (staring at
mm/memory-tiers.c) do.
I forgot
Signature · 3 lines
Cheers David / dhildenb
Quoted 33 lines · David Hildenbrand
Quoted 23 lines · Donet Tom
When
device_register()fails inregister_node(), it callsput_device(&node->dev). This triggersnode_device_release(), which calls kfree(to_node(dev)), thereby freeing the entire node structure.As a result, when
register_node()returns an error, the node memory has already been freed. Calling kfree(node) again inregister_one_node()leads to a double free.This patch removes the redundant kfree(node) from
register_one_node()to prevent the double free.Fixes 786eb990cfb7 ("drivers/base/node: handle error properly in register_one_node()")Signed-off-by Donet Tom <[email protected]>---
drivers/base/node.c| 1 -1 file changed, 1 deletion(-)drivers/base/node.c +0
-0drivers/base/node.c int register_one_node(int nid) · line 889
Quoted 6 lines
drivers/base/node.c +0
-1@@ -885,7 +885,6 @@ int register_one_node(int nid) error = register_node(node_devices[nid], nid); if (error) { node_devices[nid] = NULL; - kfree(node); return error; }Yes, that matches what other users (staring at
mm/memory-tiers.c) do.
Quoted 7 lines
I wonder if we should just inline
register_node()intoregister_one_node().Then it's clearer that we perform a
put_device()already in there.On top of that, we could then just s/register_one_node/register_node/
And then we could do a similar cleanup for
unregister_one_node/unregister_nodewhere I don't consider the split function really valuable.
Sure David, I will work on it and send it as a separate patch.
Quoted 10 lines · David Hildenbrand
Yes, that matches what other users (staring at
mm/memory-tiers.c) do.I wonder if we should just inline
register_node()intoregister_one_node().Then it's clearer that we perform a
put_device()already in there.On top of that, we could then just s/register_one_node/register_node/
And then we could do a similar cleanup for
unregister_one_node/unregister_nodewhere I don't consider the split function really valuable.
Yap, that makes sense to me as well.
Signature · 2 lines
Oscar Salvador SUSE Labs
Quoted 9 lines · Donet Tom
When
device_register()fails inregister_node(), it callsput_device(&node->dev). This triggersnode_device_release(), which calls kfree(to_node(dev)), thereby freeing the entire node structure.As a result, when
register_node()returns an error, the node memory has already been freed. Calling kfree(node) again inregister_one_node()leads to a double free.
Quoted 5 lines
This patch removes the redundant kfree(node) from
register_one_node()to prevent the double free.Fixes 786eb990cfb7 ("drivers/base/node: handle error properly in register_one_node()")Signed-off-by Donet Tom <[email protected]>
Signature · 2 lines
Oscar Salvador SUSE Labs