From: Hangbin Liu <liuhangbin@gmail.com>
To: Ziyang Xuan <william.xuanziyang@huawei.com>
Cc: jiri@resnulli.us, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH net v3] team: fix null-ptr-deref when team device type is changed
Date: Wed, 6 Sep 2023 22:12:18 +0800 [thread overview]
Message-ID: <ZPiIwruO1vgw4RfH@Laptop-X1> (raw)
In-Reply-To: <20230905081056.3365013-1-william.xuanziyang@huawei.com>
On Tue, Sep 05, 2023 at 04:10:56PM +0800, Ziyang Xuan wrote:
> ---
> drivers/net/team/team.c | 5 ++++-
> net/ethernet/eth.c | 1 +
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
> index d3dc22509ea5..12fb5f4cff06 100644
> --- a/drivers/net/team/team.c
> +++ b/drivers/net/team/team.c
> @@ -2127,7 +2127,10 @@ static const struct ethtool_ops team_ethtool_ops = {
> static void team_setup_by_port(struct net_device *dev,
> struct net_device *port_dev)
> {
> - dev->header_ops = port_dev->header_ops;
> + if (port_dev->type == ARPHRD_ETHER)
> + dev->header_ops = ð_header_ops;
> + else
> + dev->header_ops = port_dev->header_ops;
> dev->type = port_dev->type;
> dev->hard_header_len = port_dev->hard_header_len;
> dev->needed_headroom = port_dev->needed_headroom;
> diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
> index 2edc8b796a4e..157833509adb 100644
> --- a/net/ethernet/eth.c
> +++ b/net/ethernet/eth.c
> @@ -347,6 +347,7 @@ const struct header_ops eth_header_ops ____cacheline_aligned = {
> .cache_update = eth_header_cache_update,
> .parse_protocol = eth_header_parse_protocol,
> };
> +EXPORT_SYMBOL(eth_header_ops);
>
> /**
> * ether_setup - setup Ethernet network device
> --
> 2.25.1
>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
next prev parent reply other threads:[~2023-09-06 14:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-05 8:10 [PATCH net v3] team: fix null-ptr-deref when team device type is changed Ziyang Xuan
2023-09-05 8:26 ` Paolo Abeni
2023-09-05 12:01 ` Ziyang Xuan (William)
2023-09-06 14:12 ` Hangbin Liu [this message]
2023-09-11 7:44 ` Hangbin Liu
2023-09-11 9:50 ` Ziyang Xuan (William)
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=ZPiIwruO1vgw4RfH@Laptop-X1 \
--to=liuhangbin@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=william.xuanziyang@huawei.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