Skip to content

Commit f1baf68

Browse files
torvaldstorvalds
committed
Merge tag 'net-5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from netfilter and can. Current release - new code bugs: - sparx5: fix get_stat64 out-of-bound access and crash - smc: fix netdev ref tracker misuse Previous releases - regressions: - eth: ixgbevf: require large buffers for build_skb on 82599VF, avoid overflows - eth: ocelot: fix all IP traffic getting trapped to CPU with PTP over IP - bonding: fix rare link activation misses in 802.3ad mode Previous releases - always broken: - tcp: fix tcp sock mem accounting in zero-copy corner cases - remove the cached dst when uncloning an skb dst and its metadata, since we only have one ref it'd lead to an UaF - netfilter: - conntrack: don't refresh sctp entries in closed state - conntrack: re-init state for retransmitted syn-ack, avoid connection establishment getting stuck with strange stacks - ctnetlink: disable helper autoassign, avoid it getting lost - nft_payload: don't allow transport header access for fragments - dsa: fix use of devres for mdio throughout drivers - eth: amd-xgbe: disable interrupts during pci removal - eth: dpaa2-eth: unregister netdev before disconnecting the PHY - eth: ice: fix IPIP and SIT TSO offload" * tag 'net-5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (53 commits) net: dsa: mv88e6xxx: fix use-after-free in mv88e6xxx_mdios_unregister net: mscc: ocelot: fix mutex lock error during ethtool stats read ice: Avoid RTNL lock when re-creating auxiliary device ice: Fix KASAN error in LAG NETDEV_UNREGISTER handler ice: fix IPIP and SIT TSO offload ice: fix an error code in ice_cfg_phy_fec() net: mpls: Fix GCC 12 warning dpaa2-eth: unregister the netdev before disconnecting from the PHY skbuff: cleanup double word in comment net: macb: Align the dma and coherent dma masks mptcp: netlink: process IPv6 addrs in creating listening sockets selftests: mptcp: add missing join check net: usb: qmi_wwan: Add support for Dell DW5829e vlan: move dev_put into vlan_dev_uninit vlan: introduce vlan_dev_free_egress_priority ax25: fix UAF bugs of net_device caused by rebinding operation net: dsa: fix panic when DSA master device unbinds on shutdown net: amd-xgbe: disable interrupts during pci removal tipc: rate limit warning for received illegal binding update net: mdio: aspeed: Add missing MODULE_DEVICE_TABLE ...
2 parents 16f7432 + 51a04eb commit f1baf68

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+318
-155
lines changed

‎MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13303,8 +13303,8 @@ W: http://www.iptables.org/
1330313303
W: http://www.nftables.org/
1330413304
Q: http://patchwork.ozlabs.org/project/netfilter-devel/list/
1330513305
C: irc://irc.libera.chat/netfilter
13306-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
13307-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
13306+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
13307+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git
1330813308
F: include/linux/netfilter*
1330913309
F: include/linux/netfilter/
1331013310
F: include/net/netfilter/

‎drivers/net/bonding/bond_3ad.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,8 +1021,8 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr)
10211021
if (port->aggregator &&
10221022
port->aggregator->is_active &&
10231023
!__port_is_enabled(port)) {
1024-
10251024
__enable_port(port);
1025+
*update_slave_arr = true;
10261026
}
10271027
}
10281028
break;
@@ -1779,6 +1779,7 @@ static void ad_agg_selection_logic(struct aggregator *agg,
17791779
port = port->next_port_in_aggregator) {
17801780
__enable_port(port);
17811781
}
1782+
*update_slave_arr = true;
17821783
}
17831784
}
17841785

‎drivers/net/dsa/bcm_sf2.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)
621621
get_device(&priv->master_mii_bus->dev);
622622
priv->master_mii_dn = dn;
623623

624-
priv->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
624+
priv->slave_mii_bus = mdiobus_alloc();
625625
if (!priv->slave_mii_bus) {
626626
of_node_put(dn);
627627
return -ENOMEM;
@@ -681,15 +681,18 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)
681681
}
682682

683683
err = mdiobus_register(priv->slave_mii_bus);
684-
if (err && dn)
684+
if (err && dn) {
685+
mdiobus_free(priv->slave_mii_bus);
685686
of_node_put(dn);
687+
}
686688

687689
return err;
688690
}
689691

690692
static void bcm_sf2_mdio_unregister(struct bcm_sf2_priv *priv)
691693
{
692694
mdiobus_unregister(priv->slave_mii_bus);
695+
mdiobus_free(priv->slave_mii_bus);
693696
of_node_put(priv->master_mii_dn);
694697
}
695698

‎drivers/net/dsa/lantiq_gswip.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,9 @@ static int gswip_mdio_rd(struct mii_bus *bus, int addr, int reg)
498498
static int gswip_mdio(struct gswip_priv *priv, struct device_node *mdio_np)
499499
{
500500
struct dsa_switch *ds = priv->ds;
501+
int err;
501502

502-
ds->slave_mii_bus = devm_mdiobus_alloc(priv->dev);
503+
ds->slave_mii_bus = mdiobus_alloc();
503504
if (!ds->slave_mii_bus)
504505
return -ENOMEM;
505506

@@ -512,7 +513,11 @@ static int gswip_mdio(struct gswip_priv *priv, struct device_node *mdio_np)
512513
ds->slave_mii_bus->parent = priv->dev;
513514
ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask;
514515

515-
return of_mdiobus_register(ds->slave_mii_bus, mdio_np);
516+
err = of_mdiobus_register(ds->slave_mii_bus, mdio_np);
517+
if (err)
518+
mdiobus_free(ds->slave_mii_bus);
519+
520+
return err;
516521
}
517522

518523
static int gswip_pce_table_entry_read(struct gswip_priv *priv,
@@ -2145,8 +2150,10 @@ static int gswip_probe(struct platform_device *pdev)
21452150
gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);
21462151
dsa_unregister_switch(priv->ds);
21472152
mdio_bus:
2148-
if (mdio_np)
2153+
if (mdio_np) {
21492154
mdiobus_unregister(priv->ds->slave_mii_bus);
2155+
mdiobus_free(priv->ds->slave_mii_bus);
2156+
}
21502157
put_mdio_node:
21512158
of_node_put(mdio_np);
21522159
for (i = 0; i < priv->num_gphy_fw; i++)
@@ -2169,6 +2176,7 @@ static int gswip_remove(struct platform_device *pdev)
21692176

21702177
if (priv->ds->slave_mii_bus) {
21712178
mdiobus_unregister(priv->ds->slave_mii_bus);
2179+
mdiobus_free(priv->ds->slave_mii_bus);
21722180
of_node_put(priv->ds->slave_mii_bus->dev.of_node);
21732181
}
21742182

‎drivers/net/dsa/mt7530.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ mt7530_setup_mdio(struct mt7530_priv *priv)
20742074
if (priv->irq)
20752075
mt7530_setup_mdio_irq(priv);
20762076

2077-
ret = mdiobus_register(bus);
2077+
ret = devm_mdiobus_register(dev, bus);
20782078
if (ret) {
20792079
dev_err(dev, "failed to register MDIO bus: %d\n", ret);
20802080
if (priv->irq)

‎drivers/net/dsa/mv88e6xxx/chip.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3399,7 +3399,7 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
33993399
return err;
34003400
}
34013401

3402-
bus = devm_mdiobus_alloc_size(chip->dev, sizeof(*mdio_bus));
3402+
bus = mdiobus_alloc_size(sizeof(*mdio_bus));
34033403
if (!bus)
34043404
return -ENOMEM;
34053405

@@ -3424,14 +3424,14 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
34243424
if (!external) {
34253425
err = mv88e6xxx_g2_irq_mdio_setup(chip, bus);
34263426
if (err)
3427-
return err;
3427+
goto out;
34283428
}
34293429

34303430
err = of_mdiobus_register(bus, np);
34313431
if (err) {
34323432
dev_err(chip->dev, "Cannot register MDIO bus (%d)\n", err);
34333433
mv88e6xxx_g2_irq_mdio_free(chip, bus);
3434-
return err;
3434+
goto out;
34353435
}
34363436

34373437
if (external)
@@ -3440,21 +3440,26 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
34403440
list_add(&mdio_bus->list, &chip->mdios);
34413441

34423442
return 0;
3443+
3444+
out:
3445+
mdiobus_free(bus);
3446+
return err;
34433447
}
34443448

34453449
static void mv88e6xxx_mdios_unregister(struct mv88e6xxx_chip *chip)
34463450

34473451
{
3448-
struct mv88e6xxx_mdio_bus *mdio_bus;
3452+
struct mv88e6xxx_mdio_bus *mdio_bus, *p;
34493453
struct mii_bus *bus;
34503454

3451-
list_for_each_entry(mdio_bus, &chip->mdios, list) {
3455+
list_for_each_entry_safe(mdio_bus, p, &chip->mdios, list) {
34523456
bus = mdio_bus->bus;
34533457

34543458
if (!mdio_bus->external)
34553459
mv88e6xxx_g2_irq_mdio_free(chip, bus);
34563460

34573461
mdiobus_unregister(bus);
3462+
mdiobus_free(bus);
34583463
}
34593464
}
34603465

‎drivers/net/dsa/ocelot/felix_vsc9959.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)
10611061
return PTR_ERR(hw);
10621062
}
10631063

1064-
bus = devm_mdiobus_alloc_size(dev, sizeof(*mdio_priv));
1064+
bus = mdiobus_alloc_size(sizeof(*mdio_priv));
10651065
if (!bus)
10661066
return -ENOMEM;
10671067

@@ -1081,6 +1081,7 @@ static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)
10811081
rc = mdiobus_register(bus);
10821082
if (rc < 0) {
10831083
dev_err(dev, "failed to register MDIO bus\n");
1084+
mdiobus_free(bus);
10841085
return rc;
10851086
}
10861087

@@ -1132,6 +1133,7 @@ static void vsc9959_mdio_bus_free(struct ocelot *ocelot)
11321133
lynx_pcs_destroy(phylink_pcs);
11331134
}
11341135
mdiobus_unregister(felix->imdio);
1136+
mdiobus_free(felix->imdio);
11351137
}
11361138

11371139
static void vsc9959_sched_speed_set(struct ocelot *ocelot, int port,

‎drivers/net/dsa/ocelot/seville_vsc9953.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)
10291029
}
10301030

10311031
/* Needed in order to initialize the bus mutex lock */
1032-
rc = of_mdiobus_register(bus, NULL);
1032+
rc = devm_of_mdiobus_register(dev, bus, NULL);
10331033
if (rc < 0) {
10341034
dev_err(dev, "failed to register MDIO bus\n");
10351035
return rc;
@@ -1083,7 +1083,8 @@ static void vsc9953_mdio_bus_free(struct ocelot *ocelot)
10831083
mdio_device_free(mdio_device);
10841084
lynx_pcs_destroy(phylink_pcs);
10851085
}
1086-
mdiobus_unregister(felix->imdio);
1086+
1087+
/* mdiobus_unregister and mdiobus_free handled by devres */
10871088
}
10881089

10891090
static const struct felix_info seville_info_vsc9953 = {

‎drivers/net/dsa/qca/ar9331.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ static int ar9331_sw_mbus_init(struct ar9331_sw_priv *priv)
378378
if (!mnp)
379379
return -ENODEV;
380380

381-
ret = of_mdiobus_register(mbus, mnp);
381+
ret = devm_of_mdiobus_register(dev, mbus, mnp);
382382
of_node_put(mnp);
383383
if (ret)
384384
return ret;
@@ -1091,7 +1091,6 @@ static void ar9331_sw_remove(struct mdio_device *mdiodev)
10911091
}
10921092

10931093
irq_domain_remove(priv->irqdomain);
1094-
mdiobus_unregister(priv->mbus);
10951094
dsa_unregister_switch(&priv->ds);
10961095

10971096
reset_control_assert(priv->sw_reset);

‎drivers/net/ethernet/amd/xgbe/xgbe-pci.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,9 @@ static void xgbe_pci_remove(struct pci_dev *pdev)
425425

426426
pci_free_irq_vectors(pdata->pcidev);
427427

428+
/* Disable all interrupts in the hardware */
429+
XP_IOWRITE(pdata, XP_INT_EN, 0x0);
430+
428431
xgbe_free_pdata(pdata);
429432
}
430433

‎drivers/net/ethernet/cadence/macb_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4712,7 +4712,7 @@ static int macb_probe(struct platform_device *pdev)
47124712

47134713
#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
47144714
if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {
4715-
dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
4715+
dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));
47164716
bp->hw_dma_cap |= HW_DMA_CAP_64B;
47174717
}
47184718
#endif

‎drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4523,12 +4523,12 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)
45234523
#ifdef CONFIG_DEBUG_FS
45244524
dpaa2_dbg_remove(priv);
45254525
#endif
4526+
4527+
unregister_netdev(net_dev);
45264528
rtnl_lock();
45274529
dpaa2_eth_disconnect_mac(priv);
45284530
rtnl_unlock();
45294531

4530-
unregister_netdev(net_dev);
4531-
45324532
dpaa2_eth_dl_port_del(priv);
45334533
dpaa2_eth_dl_traps_unregister(priv);
45344534
dpaa2_eth_dl_free(priv);

‎drivers/net/ethernet/google/gve/gve_rx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ static bool gve_rx(struct gve_rx_ring *rx, netdev_features_t feat,
609609

610610
*packet_size_bytes = skb->len + (skb->protocol ? ETH_HLEN : 0);
611611
*work_done = work_cnt;
612+
skb_record_rx_queue(skb, rx->q_num);
612613
if (skb_is_nonlinear(skb))
613614
napi_gro_frags(napi);
614615
else

‎drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ static void ibmvnic_tx_scrq_clean_buffer(struct ibmvnic_adapter *adapter,
110110
struct ibmvnic_sub_crq_queue *tx_scrq);
111111
static void free_long_term_buff(struct ibmvnic_adapter *adapter,
112112
struct ibmvnic_long_term_buff *ltb);
113+
static void ibmvnic_disable_irqs(struct ibmvnic_adapter *adapter);
113114

114115
struct ibmvnic_stat {
115116
char name[ETH_GSTRING_LEN];
@@ -1424,7 +1425,7 @@ static int __ibmvnic_open(struct net_device *netdev)
14241425
rc = set_link_state(adapter, IBMVNIC_LOGICAL_LNK_UP);
14251426
if (rc) {
14261427
ibmvnic_napi_disable(adapter);
1427-
release_resources(adapter);
1428+
ibmvnic_disable_irqs(adapter);
14281429
return rc;
14291430
}
14301431

@@ -1474,9 +1475,6 @@ static int ibmvnic_open(struct net_device *netdev)
14741475
rc = init_resources(adapter);
14751476
if (rc) {
14761477
netdev_err(netdev, "failed to initialize resources\n");
1477-
release_resources(adapter);
1478-
release_rx_pools(adapter);
1479-
release_tx_pools(adapter);
14801478
goto out;
14811479
}
14821480
}
@@ -1493,6 +1491,13 @@ static int ibmvnic_open(struct net_device *netdev)
14931491
adapter->state = VNIC_OPEN;
14941492
rc = 0;
14951493
}
1494+
1495+
if (rc) {
1496+
release_resources(adapter);
1497+
release_rx_pools(adapter);
1498+
release_tx_pools(adapter);
1499+
}
1500+
14961501
return rc;
14971502
}
14981503

‎drivers/net/ethernet/intel/ice/ice.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ enum ice_pf_flags {
483483
ICE_FLAG_VF_TRUE_PROMISC_ENA,
484484
ICE_FLAG_MDD_AUTO_RESET_VF,
485485
ICE_FLAG_LINK_LENIENT_MODE_ENA,
486+
ICE_FLAG_PLUG_AUX_DEV,
486487
ICE_PF_FLAGS_NBITS /* must be last */
487488
};
488489

@@ -887,7 +888,7 @@ static inline void ice_set_rdma_cap(struct ice_pf *pf)
887888
if (pf->hw.func_caps.common_cap.rdma && pf->num_rdma_msix) {
888889
set_bit(ICE_FLAG_RDMA_ENA, pf->flags);
889890
set_bit(ICE_FLAG_AUX_ENA, pf->flags);
890-
ice_plug_aux_dev(pf);
891+
set_bit(ICE_FLAG_PLUG_AUX_DEV, pf->flags);
891892
}
892893
}
893894

‎drivers/net/ethernet/intel/ice/ice_common.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3342,7 +3342,8 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg,
33423342
!ice_fw_supports_report_dflt_cfg(hw)) {
33433343
struct ice_link_default_override_tlv tlv;
33443344

3345-
if (ice_get_link_default_override(&tlv, pi))
3345+
status = ice_get_link_default_override(&tlv, pi);
3346+
if (status)
33463347
goto out;
33473348

33483349
if (!(tlv.options & ICE_LINK_OVERRIDE_STRICT_MODE) &&

‎drivers/net/ethernet/intel/ice/ice_lag.c

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,17 +204,39 @@ ice_lag_unlink(struct ice_lag *lag,
204204
lag->upper_netdev = NULL;
205205
}
206206

207-
if (lag->peer_netdev) {
208-
dev_put(lag->peer_netdev);
209-
lag->peer_netdev = NULL;
210-
}
211-
207+
lag->peer_netdev = NULL;
212208
ice_set_sriov_cap(pf);
213209
ice_set_rdma_cap(pf);
214210
lag->bonded = false;
215211
lag->role = ICE_LAG_NONE;
216212
}
217213

214+
/**
215+
* ice_lag_unregister - handle netdev unregister events
216+
* @lag: LAG info struct
217+
* @netdev: netdev reporting the event
218+
*/
219+
static void ice_lag_unregister(struct ice_lag *lag, struct net_device *netdev)
220+
{
221+
struct ice_pf *pf = lag->pf;
222+
223+
/* check to see if this event is for this netdev
224+
* check that we are in an aggregate
225+
*/
226+
if (netdev != lag->netdev || !lag->bonded)
227+
return;
228+
229+
if (lag->upper_netdev) {
230+
dev_put(lag->upper_netdev);
231+
lag->upper_netdev = NULL;
232+
ice_set_sriov_cap(pf);
233+
ice_set_rdma_cap(pf);
234+
}
235+
/* perform some cleanup in case we come back */
236+
lag->bonded = false;
237+
lag->role = ICE_LAG_NONE;
238+
}
239+
218240
/**
219241
* ice_lag_changeupper_event - handle LAG changeupper event
220242
* @lag: LAG info struct
@@ -307,7 +329,7 @@ ice_lag_event_handler(struct notifier_block *notif_blk, unsigned long event,
307329
ice_lag_info_event(lag, ptr);
308330
break;
309331
case NETDEV_UNREGISTER:
310-
ice_lag_unlink(lag, ptr);
332+
ice_lag_unregister(lag, netdev);
311333
break;
312334
default:
313335
break;

‎drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,7 @@ struct ice_tx_ctx_desc {
568568
(0x3FFFFULL << ICE_TXD_CTX_QW1_TSO_LEN_S)
569569

570570
#define ICE_TXD_CTX_QW1_MSS_S 50
571+
#define ICE_TXD_CTX_MIN_MSS 64
571572

572573
#define ICE_TXD_CTX_QW1_VSI_S 50
573574
#define ICE_TXD_CTX_QW1_VSI_M (0x3FFULL << ICE_TXD_CTX_QW1_VSI_S)

0 commit comments

Comments
 (0)