| Message ID | 20220421101247.121896-1-clement.leger@bootlin.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7f40ea2145d926510b27b785562d2c92df1b0d91 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: bridge: switchdev: check br_vlan_group() return value | expand |
On 21/04/2022 13:12, Clément Léger wrote: > br_vlan_group() can return NULL and thus return value must be checked > to avoid dereferencing a NULL pointer. > > Fixes: 6284c723d9b9 ("net: bridge: mst: Notify switchdev drivers of VLAN MSTI migrations") > Signed-off-by: Clément Léger <clement.leger@bootlin.com> > --- > net/bridge/br_switchdev.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c > index 81400e0b26ac..8f3d76c751dd 100644 > --- a/net/bridge/br_switchdev.c > +++ b/net/bridge/br_switchdev.c > @@ -354,6 +354,8 @@ static int br_switchdev_vlan_attr_replay(struct net_device *br_dev, > attr.orig_dev = br_dev; > > vg = br_vlan_group(br); > + if (!vg) > + return 0; > > list_for_each_entry(v, &vg->vlan_list, vlist) { > if (v->msti) { Good catch. Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
On Thu, 21 Apr 2022 13:17:51 +0300 Nikolay Aleksandrov wrote: > On 21/04/2022 13:12, Clément Léger wrote: > > br_vlan_group() can return NULL and thus return value must be checked > > to avoid dereferencing a NULL pointer. > > > > Fixes: 6284c723d9b9 ("net: bridge: mst: Notify switchdev drivers of VLAN MSTI migrations") > > Signed-off-by: Clément Léger <clement.leger@bootlin.com> > > --- > > net/bridge/br_switchdev.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c > > index 81400e0b26ac..8f3d76c751dd 100644 > > --- a/net/bridge/br_switchdev.c > > +++ b/net/bridge/br_switchdev.c > > @@ -354,6 +354,8 @@ static int br_switchdev_vlan_attr_replay(struct net_device *br_dev, > > attr.orig_dev = br_dev; > > > > vg = br_vlan_group(br); > > + if (!vg) > > + return 0; > > > > list_for_each_entry(v, &vg->vlan_list, vlist) { > > if (v->msti) { > > Acked-by: Nikolay Aleksandrov <razor@blackwall.org> Thanks! Applying to net tho, the patch in question is already in Linus's tree.
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 21 Apr 2022 12:12:47 +0200 you wrote: > br_vlan_group() can return NULL and thus return value must be checked > to avoid dereferencing a NULL pointer. > > Fixes: 6284c723d9b9 ("net: bridge: mst: Notify switchdev drivers of VLAN MSTI migrations") > Signed-off-by: Clément Léger <clement.leger@bootlin.com> > --- > net/bridge/br_switchdev.c | 2 ++ > 1 file changed, 2 insertions(+) Here is the summary with links: - [net-next] net: bridge: switchdev: check br_vlan_group() return value https://git.kernel.org/netdev/net/c/7f40ea2145d9 You are awesome, thank you!
diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c index 81400e0b26ac..8f3d76c751dd 100644 --- a/net/bridge/br_switchdev.c +++ b/net/bridge/br_switchdev.c @@ -354,6 +354,8 @@ static int br_switchdev_vlan_attr_replay(struct net_device *br_dev, attr.orig_dev = br_dev; vg = br_vlan_group(br); + if (!vg) + return 0; list_for_each_entry(v, &vg->vlan_list, vlist) { if (v->msti) {
br_vlan_group() can return NULL and thus return value must be checked to avoid dereferencing a NULL pointer. Fixes: 6284c723d9b9 ("net: bridge: mst: Notify switchdev drivers of VLAN MSTI migrations") Signed-off-by: Clément Léger <clement.leger@bootlin.com> --- net/bridge/br_switchdev.c | 2 ++ 1 file changed, 2 insertions(+)