From: Allen <allen.pais@oracle.com>
To: Florian Fainelli <f.fainelli@gmail.com>, netdev@vger.kernel.org
Cc: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH net] net: dsa: Do not leave DSA master with NULL netdev_ops
Date: Tue, 5 May 2020 11:37:12 +0530 [thread overview]
Message-ID: <905b0b48-5184-3b11-2f78-e99834dbc38a@oracle.com> (raw)
In-Reply-To: <20200504201806.27192-1-f.fainelli@gmail.com>
> When ndo_get_phys_port_name() for the CPU port was added we introduced
> an early check for when the DSA master network device in
> dsa_master_ndo_setup() already implements ndo_get_phys_port_name(). When
> we perform the teardown operation in dsa_master_ndo_teardown() we would
> not be checking that cpu_dp->orig_ndo_ops was successfully allocated and
> non-NULL initialized.
>
> With network device drivers such as virtio_net, this leads to a NPD as
> soon as the DSA switch hanging off of it gets torn down because we are
> now assigning the virtio_net device's netdev_ops a NULL pointer.
>
> Fixes: da7b9e9b00d4 ("net: dsa: Add ndo_get_phys_port_name() for CPU port")
> Reported-by: Allen Pais <allen.pais@oracle.com>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Allen Pais <allen.pais@oracle.com>
Thank you Florain.
> ---
> net/dsa/master.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/dsa/master.c b/net/dsa/master.c
> index b5c535af63a3..a621367c6e8c 100644
> --- a/net/dsa/master.c
> +++ b/net/dsa/master.c
> @@ -289,7 +289,8 @@ static void dsa_master_ndo_teardown(struct net_device *dev)
> {
> struct dsa_port *cpu_dp = dev->dsa_ptr;
>
> - dev->netdev_ops = cpu_dp->orig_ndo_ops;
> + if (cpu_dp->orig_ndo_ops)
> + dev->netdev_ops = cpu_dp->orig_ndo_ops;
> cpu_dp->orig_ndo_ops = NULL;
> }
>
>
next prev parent reply other threads:[~2020-05-05 6:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 20:18 [PATCH net] net: dsa: Do not leave DSA master with NULL netdev_ops Florian Fainelli
2020-05-04 20:34 ` Vladimir Oltean
2020-05-04 20:40 ` Florian Fainelli
2020-05-04 20:49 ` Vladimir Oltean
2020-05-04 21:03 ` Florian Fainelli
2020-05-05 6:07 ` Allen [this message]
2020-05-07 0:32 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=905b0b48-5184-3b11-2f78-e99834dbc38a@oracle.com \
--to=allen.pais@oracle.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).