netdev - Re: [PATCH net] rocker: handle non-bridge master change

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAE4R7bALENahPfnbB0nm-gU-syXYHLx92iqrR09seP1kYbR+sg@mail.gmail.com>
Date:	Mon, 23 Mar 2015 11:43:51 -0700
From:	Scott Feldman <sfeldma@...il.com>
To:	Simon Horman <simon.horman@...ronome.com>
Cc:	Jiri Pirko <jiri@...nulli.us>,
	"David S. Miller" <davem@...emloft.net>,
	Netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH net] rocker: handle non-bridge master change

On Sun, Mar 22, 2015 at 11:13 PM, Simon Horman
<simon.horman@...ronome.com> wrote:
> Master change notifications may occur other than when joining or
> leaving a bridge, for example when being added to or removed from
> a bond or Open vSwitch.
>
> Previously in those cases rocker_port_bridge_leave() was called
> which results in a null-pointer dereference as rocker_port->bridge_dev
> is NULL because there is no bridge device.
>
> This patch makes provision for doing nothing in such cases.
>
> Fixes: 6c7079450071f ("rocker: implement L2 bridge offloading")
> Signed-off-by: Simon Horman <simon.horman@...ronome.com>
> ---
>  drivers/net/ethernet/rocker/rocker.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
> index 9fb6948..0390714 100644
> --- a/drivers/net/ethernet/rocker/rocker.c
> +++ b/drivers/net/ethernet/rocker/rocker.c
> @@ -4468,10 +4468,16 @@ static int rocker_port_master_changed(struct net_device *dev)
>         struct net_device *master = netdev_master_upper_dev_get(dev);
>         int err = 0;
>
> +       /* There are currently three cases handled here:
> +        * 1. Joining a bridge
> +        * 2. Leaving a previously joined bridge
> +        * 3. Other, e.g. being added to or removed from a bond or openvswitch,
> +        *    in which case nothing is done
> +        */
>         if (master && master->rtnl_link_ops &&
>             !strcmp(master->rtnl_link_ops->kind, "bridge"))
>                 err = rocker_port_bridge_join(rocker_port, master);
> -       else
> +       else if (rocker_port->bridge_dev)
>                 err = rocker_port_bridge_leave(rocker_port);

Please send v2 that uses rocker_port_is_bridged(), otherwise looks
good, thanks Simon.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html