net: fix sysfs symlinks of adjacent devices
Subsystems (2)
PATCH 1/1 net: fix sysfs symlinks of adjacent devices
From: "Alexander Y. Fomichev" <[email protected]>
__netdev_adjacent_dev_insert may add adjacent device from another namespace. Without proper check it leads to emergence of broken symlink from/to device not existing in current namespace.
Fix: check net_ns is the same before netdev_adjacent_sysfs_add/del related to: 4c75431ac3520631f1d9e74aa88407e6374dbbc4
--- net/core/dev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/core/dev.c +4 -2
@@ -4841,7 +4841,8 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,pr_debug ("dev_hold for %s, because of link added from %s to %s\n" , adj_dev->name, dev->name, adj_dev->name); -if (netdev_adjacent_is_neigh_list (dev, dev_list)) { +if (netdev_adjacent_is_neigh_list (dev, dev_list) && +net_eq (dev_net (dev),dev_net (adj_dev))) { ret =netdev_adjacent_sysfs_add (dev, adj_dev, dev_list);if (ret) goto free_adj;
@@ -4862,7 +4863,8 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,return 0 ; remove_symlinks: -if (netdev_adjacent_is_neigh_list (dev, dev_list)) +if (netdev_adjacent_is_neigh_list (dev, dev_list) && +net_eq (dev_net (dev),dev_net (adj_dev)))netdev_adjacent_sysfs_del (dev, adj_dev->name, dev_list); free_adj:kfree (adj);
Signature · 1 line
2.1.0
Quoted 29 lines · Alexander Fomichev
From: "Alexander Y. Fomichev" <[email protected]>
__netdev_adjacent_dev_insertmay add adjacent device from another namespace. Without proper check it leads to emergence of broken symlink from/to device not existing in current namespace.
Fix: checknet_nsis the same before netdev_adjacent_sysfs_add/del related to:4c75431ac3520631f1d9e74aa88407e6374dbbc4Signed-off-by Alexander Y. Fomichev <[email protected]>--- net/core/dev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)net/core/dev.c +2
-1@@ -4841,7 +4841,8 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,pr_debug ("dev_hold for %s, because of link added from %s to %s\n" , adj_dev->name, dev->name, adj_dev->name); -if (netdev_adjacent_is_neigh_list (dev, dev_list)) { +if (netdev_adjacent_is_neigh_list (dev, dev_list) && +net_eq (dev_net (dev),dev_net (adj_dev))) { ret =netdev_adjacent_sysfs_add (dev, adj_dev, dev_list);if (ret) goto free_adj;
net/core/dev.c static int __netdev_adjacent_dev_insert(struct net_device *dev, · line 4870
Quoted 9 lines
net/core/dev.c +2
-1@@ -4862,7 +4863,8 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,return 0 ; remove_symlinks: -if (netdev_adjacent_is_neigh_list (dev, dev_list)) +if (netdev_adjacent_is_neigh_list (dev, dev_list) && +net_eq (dev_net (dev),dev_net (adj_dev)))netdev_adjacent_sysfs_del (dev, adj_dev->name, dev_list); free_adj:kfree (adj);
Looking over the code, it might make sense to move all the net_eq checks into adjacent_sysfs calls so as to consolidate them. I haven't audited all code paths, but at first glance it should do the right thing.
What do you think?
-vlad
David Miller
maintainerFrom: Vlad Yasevich <[email protected]>
Date: Fri, 12 Sep 2014 09:33:39 -0400
Quoted 5 lines
Looking over the code, it might make sense to move all the
net_eqchecks intoadjacent_sysfscalls so as to consolidate them. I haven't audited all code paths, but at first glance it should do the right thing.What do you think?
Agreed, let's do the following then?
net/core/dev.c +11 -7
@@ -4809,9 +4809,14 @@ static void netdev_adjacent_sysfs_del(struct net_device *dev,sysfs_remove_link (&(dev->dev.kobj), linkname); } -#define netdev_adjacent_is_neigh_list (dev, dev_list) \ - (dev_list == &dev->adj_list.upper || \ - dev_list == &dev->adj_list.lower) +static bool netdev_adjacent_is_neigh_list (struct net_device *dev, +struct net_device *adj_dev, +struct list_head *dev_list) +{ +return (dev_list == &dev->adj_list.upper || + dev_list == &dev->adj_list.lower) && +net_eq (dev_net (dev),dev_net (adj_dev)); +} static int __netdev_adjacent_dev_insert(struct net_device *dev, struct net_device *adj_dev,
@@ -4841,7 +4846,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,pr_debug ("dev_hold for %s, because of link added from %s to %s\n" , adj_dev->name, dev->name, adj_dev->name); -if (netdev_adjacent_is_neigh_list (dev, dev_list)) { +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list)) { ret =netdev_adjacent_sysfs_add (dev, adj_dev, dev_list);if (ret) goto free_adj;
@@ -4862,7 +4867,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,return 0 ; remove_symlinks: -if (netdev_adjacent_is_neigh_list (dev, dev_list)) +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list))netdev_adjacent_sysfs_del (dev, adj_dev->name, dev_list); free_adj:kfree (adj);
@@ -4895,8 +4900,7 @@ static void __netdev_adjacent_dev_remove(struct net_device *dev,if (adj->master)sysfs_remove_link (&(dev->dev.kobj),"master" ); -if (netdev_adjacent_is_neigh_list (dev, dev_list) && -net_eq (dev_net (dev),dev_net (adj_dev))) +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list))netdev_adjacent_sysfs_del (dev, adj_dev->name, dev_list);list_del_rcu (&adj->list);
tnx, i had thinking move it to netdev_adjacent_sysfs_add/del.. but this is better.
Quoted 61 lines · David Miller
From: Vlad Yasevich <[email protected]>
Date: Fri, 12 Sep 2014 09:33:39 -0400Quoted 5 lines
Looking over the code, it might make sense to move all the
net_eqchecks intoadjacent_sysfscalls so as to consolidate them. I haven't audited all code paths, but at first glance it should do the right thing.What do you think?
Agreed, let's do the following then?
net/core/dev.c +11
-7@@ -4809,9 +4809,14 @@ static void netdev_adjacent_sysfs_del(struct net_device *dev,sysfs_remove_link (&(dev->dev.kobj), linkname); } -#define netdev_adjacent_is_neigh_list (dev, dev_list) \ - (dev_list == &dev->adj_list.upper || \ - dev_list == &dev->adj_list.lower) +static bool netdev_adjacent_is_neigh_list (struct net_device *dev, +struct net_device *adj_dev, +struct list_head *dev_list) +{ +return (dev_list == &dev->adj_list.upper || + dev_list == &dev->adj_list.lower) && +net_eq (dev_net (dev),dev_net (adj_dev)); +} static int __netdev_adjacent_dev_insert(struct net_device *dev, struct net_device *adj_dev,@@ -4841,7 +4846,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,pr_debug ("dev_hold for %s, because of link added from %s to %s\n" , adj_dev->name, dev->name, adj_dev->name); -if (netdev_adjacent_is_neigh_list (dev, dev_list)) { +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list)) { ret =netdev_adjacent_sysfs_add (dev, adj_dev, dev_list);if (ret) goto free_adj;@@ -4862,7 +4867,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,return 0 ; remove_symlinks: -if (netdev_adjacent_is_neigh_list (dev, dev_list)) +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list))netdev_adjacent_sysfs_del (dev, adj_dev->name, dev_list); free_adj:kfree (adj);@@ -4895,8 +4900,7 @@ static void __netdev_adjacent_dev_remove(struct net_device *dev,if (adj->master)sysfs_remove_link (&(dev->dev.kobj),"master" ); -if (netdev_adjacent_is_neigh_list (dev, dev_list) && -net_eq (dev_net (dev),dev_net (adj_dev))) +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list))netdev_adjacent_sysfs_del (dev, adj_dev->name, dev_list);list_del_rcu (&adj->list);
Signature · 2 lines
Best regards.
Alexander Y. Fomichev <[email protected]>PATCH 1/1 net: fix creation adjacent device symlinks
In reply to David Miller__netdev_adjacent_dev_insert may add adjust device of different net namespace, without proper check it leads to emergence of broken sysfs links from/to devices in another namespace.
Fix: rewrite netdev_adjacent_is_neigh_list macro as a function,
move net_eq check into netdev_adjacent_is_neigh_list. (thanks David)
related to: 4c75431ac3520631f1d9e74aa88407e6374dbbc4
--- net/core/dev.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
net/core/dev.c +11 -7
@@ -4809,9 +4809,14 @@ static void netdev_adjacent_sysfs_del(struct net_device *dev,sysfs_remove_link (&(dev->dev.kobj), linkname); } -#define netdev_adjacent_is_neigh_list (dev, dev_list) \ - (dev_list == &dev->adj_list.upper || \ - dev_list == &dev->adj_list.lower) +static inline bool netdev_adjacent_is_neigh_list (struct net_device *dev, +struct net_device *adj_dev, +struct list_head *dev_list) +{ +return (dev_list == &dev->adj_list.upper || + dev_list == &dev->adj_list.lower) && +net_eq (dev_net (dev),dev_net (adj_dev)); +} static int __netdev_adjacent_dev_insert(struct net_device *dev, struct net_device *adj_dev,
@@ -4841,7 +4846,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,pr_debug ("dev_hold for %s, because of link added from %s to %s\n" , adj_dev->name, dev->name, adj_dev->name); -if (netdev_adjacent_is_neigh_list (dev, dev_list)) { +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list)) { ret =netdev_adjacent_sysfs_add (dev, adj_dev, dev_list);if (ret) goto free_adj;
@@ -4862,7 +4867,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,return 0 ; remove_symlinks: -if (netdev_adjacent_is_neigh_list (dev, dev_list)) +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list))netdev_adjacent_sysfs_del (dev, adj_dev->name, dev_list); free_adj:kfree (adj);
@@ -4895,8 +4900,7 @@ static void __netdev_adjacent_dev_remove(struct net_device *dev,if (adj->master)sysfs_remove_link (&(dev->dev.kobj),"master" ); -if (netdev_adjacent_is_neigh_list (dev, dev_list) && -net_eq (dev_net (dev),dev_net (adj_dev))) +if (netdev_adjacent_is_neigh_list (dev, adj_dev, dev_list))netdev_adjacent_sysfs_del (dev, adj_dev->name, dev_list);list_del_rcu (&adj->list);
Signature · 1 line
2.1.0
Re: [PATCH net] net: fix creation adjacent device symlinks
From: Alexander Fomichev <[email protected]>
Date: Mon, 15 Sep 2014 14:22:35 +0400
Quoted 9 lines
__netdev_adjacent_dev_insertmay add adjust device of different net namespace, without proper check it leads to emergence of broken sysfs links from/to devices in another namespace.
Fix: rewritenetdev_adjacent_is_neigh_listmacro as a function,
movenet_eqcheck intonetdev_adjacent_is_neigh_list. (thanks David)
related to:4c75431ac3520631f1d9e74aa88407e6374dbbc4Signed-off-by Alexander Fomichev <[email protected]>
Applied, thanks.
Hi,
Quoted 8 lines · Alexander Fomichev
From: "Alexander Y. Fomichev" <[email protected]>
__netdev_adjacent_dev_insertmay add adjacent device from another namespace. Without proper check it leads to emergence of broken symlink from/to device not existing in current namespace.
Fix: checknet_nsis the same before netdev_adjacent_sysfs_add/del related to:4c75431ac3520631f1d9e74aa88407e6374dbbc4
This version, applied on top of 8ba4caf1ee, fixes the bug I had reported. Not just the testcase, but the actual usage scenario.
I haven't tested David's version, but it doesn't look likely to be materially different.
Greetings,
Andres Freund