2022-04-22 20:30:16

by Clément Léger

Subject: [PATCH net-next] net: bridge: switchdev: check br_vlan_group() return value

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 <[email protected]>
---
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) {
--
2.34.1

2022-04-22 21:59:09

by Nikolay Aleksandrov

Subject: Re: [PATCH net-next] net: bridge: switchdev: check br_vlan_group() return value

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 <[email protected]>
> ---
> 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 <[email protected]>

2022-04-22 23:23:40

by Jakub Kicinski

Subject: Re: [PATCH net-next] net: bridge: switchdev: check br_vlan_group() return value

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 <[email protected]>
> > ---
> > 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 <[email protected]>

Thanks! Applying to net tho, the patch in question is already
in Linus's tree.

2022-04-22 23:24:49

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next] net: bridge: switchdev: check br_vlan_group() return value

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

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 <[email protected]>
> ---
> 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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html