diff options
| author | openeuler-ci-bot <george@openeuler.sh> | 2024-04-16 01:29:30 +0000 |
|---|---|---|
| committer | Gitee <noreply@gitee.com> | 2024-04-16 01:29:30 +0000 |
| commit | 8f9b035c4fb44c9cf16d33c68e4163d0ca8cb854 (patch) | |
| tree | 8ecd30d232cd8d2fe641ed4481759848467d5dea | |
| parent | 6672914f6b649685ca605bad0c789923598ad5ca (diff) | |
| parent | 36347ebe6eb5225b510598f397bd467f5912f521 (diff) | |
| download | openEuler-kernel-8f9b035c4fb44c9cf16d33c68e4163d0ca8cb854.tar.gz | |
!5122 [sync] PR-5062: team: fix null-ptr-deref when team device type is changed
Merge Pull Request from: @openeuler-sync-bot
Origin pull request:
https://gitee.com/openeuler/kernel/pulls/5062
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4XZVYTE3JFF5YGUNOZC5HAQ7VUR25N4E/
https://gitee.com/src-openeuler/kernel/issues/I95ATZ
Link:https://gitee.com/openeuler/kernel/pulls/5122
Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>
| -rw-r--r-- | drivers/net/team/team.c | 10 | ||||
| -rw-r--r-- | include/linux/if_team.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 8a1619695421b6..df2361d3234f94 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2122,7 +2122,12 @@ 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; + struct team *team = netdev_priv(dev); + + if (port_dev->type == ARPHRD_ETHER) + dev->header_ops = team->header_ops_cache; + 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; @@ -2160,8 +2165,11 @@ static int team_dev_type_check_change(struct net_device *dev, static void team_setup(struct net_device *dev) { + struct team *team = netdev_priv(dev); + ether_setup(dev); dev->max_mtu = ETH_MAX_MTU; + team->header_ops_cache = dev->header_ops; dev->netdev_ops = &team_netdev_ops; dev->ethtool_ops = &team_ethtool_ops; diff --git a/include/linux/if_team.h b/include/linux/if_team.h index 5dd1657947b75c..762c77d13e7dd2 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -189,6 +189,8 @@ struct team { struct net_device *dev; /* associated netdevice */ struct team_pcpu_stats __percpu *pcpu_stats; + const struct header_ops *header_ops_cache; + struct mutex lock; /* used for overall locking, e.g. port lists write */ /* |