Skip to content

Commit 23a4642

Browse files
torvaldstorvalds
committed
Merge tag 'net-5.17-rc2' 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: - tcp: add a missing sk_defer_free_flush() in tcp_splice_read() - tcp: add a stub for sk_defer_free_flush(), fix CONFIG_INET=n - nf_tables: set last expression in register tracking area - nft_connlimit: fix memleak if nf_ct_netns_get() fails - mptcp: fix removing ids bitmap setting - bonding: use rcu_dereference_rtnl when getting active slave - fix three cases of sleep in atomic context in drivers: lan966x, gve - handful of build fixes for esoteric drivers after netdev->dev_addr was made const Previous releases - regressions: - revert "ipv6: Honor all IPv6 PIO Valid Lifetime values", it broke Linux compatibility with USGv6 tests - procfs: show net device bound packet types - ipv4: fix ip option filtering for locally generated fragments - phy: broadcom: hook up soft_reset for BCM54616S Previous releases - always broken: - ipv4: raw: lock the socket in raw_bind() - ipv4: decrease the use of shared IPID generator to decrease the chance of attackers guessing the values - procfs: fix cross-netns information leakage in /proc/net/ptype - ethtool: fix link extended state for big endian - bridge: vlan: fix single net device option dumping - ping: fix the sk_bound_dev_if match in ping_lookup" * tag 'net-5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (86 commits) net: bridge: vlan: fix memory leak in __allowed_ingress net: socket: rename SKB_DROP_REASON_SOCKET_FILTER ipv4: remove sparse error in ip_neigh_gw4() ipv4: avoid using shared IP generator for connected sockets ipv4: tcp: send zero IPID in SYNACK messages ipv4: raw: lock the socket in raw_bind() MAINTAINERS: add missing IPv4/IPv6 header paths MAINTAINERS: add more files to eth PHY net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() net: bridge: vlan: fix single net device option dumping net: stmmac: skip only stmmac_ptp_register when resume from suspend net: stmmac: configure PTP clock source prior to PTP initialization Revert "ipv6: Honor all IPv6 PIO Valid Lifetime values" connector/cn_proc: Use task_is_in_init_pid_ns() pid: Introduce helper task_is_in_init_pid_ns() gve: Fix GFP flags when allocing pages net: lan966x: Fix sleep in atomic context when updating MAC table net: lan966x: Fix sleep in atomic context when injecting frames ethernet: seeq/ether3: don't write directly to netdev->dev_addr ethernet: 8390/etherh: don't write directly to netdev->dev_addr ...
2 parents a0f90c8 + fd20d97 commit 23a4642

Some content is hidden

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

94 files changed

+811
-397
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ Boris Brezillon <[email protected]> <[email protected]>
7070
Boris Brezillon <[email protected]> <[email protected]>
7171
Brian Avery <[email protected]>
7272
Brian King <[email protected]>
73+
Brian Silverman <[email protected]> <[email protected]>
7374
Changbin Du <[email protected]> <[email protected]>
7475
Changbin Du <[email protected]> <[email protected]>
7576
Chao Yu <[email protected]> <[email protected]>

‎Documentation/devicetree/bindings/net/can/tcan4x5x.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ tcan4x5x: tcan4x5x@0 {
3131
#address-cells = <1>;
3232
#size-cells = <1>;
3333
spi-max-frequency = <10000000>;
34-
bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;
34+
bosch,mram-cfg = <0x0 0 0 16 0 0 1 1>;
3535
interrupt-parent = <&gpio1>;
3636
interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
3737
device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

‎MAINTAINERS

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,9 @@ M: Johannes Berg <[email protected]>
190190
L: [email protected]
191191
S: Maintained
192192
W: https://wireless.wiki.kernel.org/
193-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
194-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
193+
Q: https://patchwork.kernel.org/project/linux-wireless/list/
194+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
195+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
195196
F: Documentation/driver-api/80211/cfg80211.rst
196197
F: Documentation/networking/regulatory.rst
197198
F: include/linux/ieee80211.h
@@ -7208,8 +7209,10 @@ F: drivers/net/mdio/of_mdio.c
72087209
F: drivers/net/pcs/
72097210
F: drivers/net/phy/
72107211
F: include/dt-bindings/net/qca-ar803x.h
7212+
F: include/linux/linkmode.h
72117213
F: include/linux/*mdio*.h
72127214
F: include/linux/mdio/*.h
7215+
F: include/linux/mii.h
72137216
F: include/linux/of_net.h
72147217
F: include/linux/phy.h
72157218
F: include/linux/phy_fixed.h
@@ -11366,8 +11369,9 @@ M: Johannes Berg <[email protected]>
1136611369
L: [email protected]
1136711370
S: Maintained
1136811371
W: https://wireless.wiki.kernel.org/
11369-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
11370-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
11372+
Q: https://patchwork.kernel.org/project/linux-wireless/list/
11373+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
11374+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
1137111375
F: Documentation/networking/mac80211-injection.rst
1137211376
F: Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
1137311377
F: drivers/net/wireless/mac80211_hwsim.[ch]
@@ -13374,9 +13378,10 @@ NETWORKING DRIVERS (WIRELESS)
1337413378
M: Kalle Valo <[email protected]>
1337513379
L: [email protected]
1337613380
S: Maintained
13377-
Q: http://patchwork.kernel.org/project/linux-wireless/list/
13378-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
13379-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
13381+
W: https://wireless.wiki.kernel.org/
13382+
Q: https://patchwork.kernel.org/project/linux-wireless/list/
13383+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
13384+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
1338013385
F: Documentation/devicetree/bindings/net/wireless/
1338113386
F: drivers/net/wireless/
1338213387

@@ -13449,7 +13454,11 @@ L: [email protected]
1344913454
S: Maintained
1345013455
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
1345113456
F: arch/x86/net/*
13457+
F: include/linux/ip.h
13458+
F: include/linux/ipv6*
13459+
F: include/net/fib*
1345213460
F: include/net/ip*
13461+
F: include/net/route.h
1345313462
F: net/ipv4/
1345413463
F: net/ipv6/
1345513464

@@ -13510,10 +13519,6 @@ F: include/net/tls.h
1351013519
F: include/uapi/linux/tls.h
1351113520
F: net/tls/*
1351213521

13513-
NETWORKING [WIRELESS]
13514-
L: [email protected]
13515-
Q: http://patchwork.kernel.org/project/linux-wireless/list/
13516-
1351713522
NETXEN (1/10) GbE SUPPORT
1351813523
M: Manish Chopra <[email protected]>
1351913524
M: Rahul Verma <[email protected]>
@@ -16532,8 +16537,9 @@ M: Johannes Berg <[email protected]>
1653216537
L: [email protected]
1653316538
S: Maintained
1653416539
W: https://wireless.wiki.kernel.org/
16535-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
16536-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
16540+
Q: https://patchwork.kernel.org/project/linux-wireless/list/
16541+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
16542+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
1653716543
F: Documentation/ABI/stable/sysfs-class-rfkill
1653816544
F: Documentation/driver-api/rfkill.rst
1653916545
F: include/linux/rfkill.h

‎drivers/connector/cn_proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg,
358358
* other namespaces.
359359
*/
360360
if ((current_user_ns() != &init_user_ns) ||
361-
(task_active_pid_ns(current) != &init_pid_ns))
361+
!task_is_in_init_pid_ns(current))
362362
return;
363363

364364
/* Can only change if privileged. */

‎drivers/net/bonding/bond_main.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4133,9 +4133,7 @@ static int bond_eth_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cm
41334133

41344134
fallthrough;
41354135
case SIOCGHWTSTAMP:
4136-
rcu_read_lock();
41374136
real_dev = bond_option_active_slave_get_rcu(bond);
4138-
rcu_read_unlock();
41394137
if (!real_dev)
41404138
return -EOPNOTSUPP;
41414139

@@ -5382,9 +5380,7 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
53825380
struct net_device *real_dev;
53835381
struct phy_device *phydev;
53845382

5385-
rcu_read_lock();
53865383
real_dev = bond_option_active_slave_get_rcu(bond);
5387-
rcu_read_unlock();
53885384
if (real_dev) {
53895385
ops = real_dev->ethtool_ops;
53905386
phydev = real_dev->phydev;

‎drivers/net/can/flexcan/flexcan-core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ static_assert(sizeof(struct flexcan_regs) == 0x4 * 18 + 0xfb8);
296296
static const struct flexcan_devtype_data fsl_mcf5441x_devtype_data = {
297297
.quirks = FLEXCAN_QUIRK_BROKEN_PERR_STATE |
298298
FLEXCAN_QUIRK_NR_IRQ_3 | FLEXCAN_QUIRK_NR_MB_16 |
299+
FLEXCAN_QUIRK_SUPPPORT_RX_MAILBOX |
299300
FLEXCAN_QUIRK_SUPPPORT_RX_FIFO,
300301
};
301302

‎drivers/net/can/flexcan/flexcan.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Below is some version info we got:
2222
* SOC Version IP-Version Glitch- [TR]WRN_INT IRQ Err Memory err RTR rece- FD Mode MB
2323
* Filter? connected? Passive detection ption in MB Supported?
24-
* MCF5441X FlexCAN2 ? no yes no no yes no 16
24+
* MCF5441X FlexCAN2 ? no yes no no no no 16
2525
* MX25 FlexCAN2 03.00.00.00 no no no no no no 64
2626
* MX28 FlexCAN2 03.00.04.00 yes yes no no no no 64
2727
* MX35 FlexCAN2 03.00.00.00 no no no no no no 64

‎drivers/net/can/m_can/m_can.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,9 @@ m_can_fifo_read(struct m_can_classdev *cdev,
336336
u32 addr_offset = cdev->mcfg[MRAM_RXF0].off + fgi * RXF0_ELEMENT_SIZE +
337337
offset;
338338

339+
if (val_count == 0)
340+
return 0;
341+
339342
return cdev->ops->read_fifo(cdev, addr_offset, val, val_count);
340343
}
341344

@@ -346,6 +349,9 @@ m_can_fifo_write(struct m_can_classdev *cdev,
346349
u32 addr_offset = cdev->mcfg[MRAM_TXB].off + fpi * TXB_ELEMENT_SIZE +
347350
offset;
348351

352+
if (val_count == 0)
353+
return 0;
354+
349355
return cdev->ops->write_fifo(cdev, addr_offset, val, val_count);
350356
}
351357

‎drivers/net/can/m_can/tcan4x5x-regmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#define TCAN4X5X_SPI_INSTRUCTION_WRITE (0x61 << 24)
1313
#define TCAN4X5X_SPI_INSTRUCTION_READ (0x41 << 24)
1414

15-
#define TCAN4X5X_MAX_REGISTER 0x8ffc
15+
#define TCAN4X5X_MAX_REGISTER 0x87fc
1616

1717
static int tcan4x5x_regmap_gather_write(void *context,
1818
const void *reg, size_t reg_len,

‎drivers/net/ethernet/3com/typhoon.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2278,6 +2278,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
22782278
struct net_device *dev;
22792279
struct typhoon *tp;
22802280
int card_id = (int) ent->driver_data;
2281+
u8 addr[ETH_ALEN] __aligned(4);
22812282
void __iomem *ioaddr;
22822283
void *shared;
22832284
dma_addr_t shared_dma;
@@ -2409,8 +2410,9 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
24092410
goto error_out_reset;
24102411
}
24112412

2412-
*(__be16 *)&dev->dev_addr[0] = htons(le16_to_cpu(xp_resp[0].parm1));
2413-
*(__be32 *)&dev->dev_addr[2] = htonl(le32_to_cpu(xp_resp[0].parm2));
2413+
*(__be16 *)&addr[0] = htons(le16_to_cpu(xp_resp[0].parm1));
2414+
*(__be32 *)&addr[2] = htonl(le32_to_cpu(xp_resp[0].parm2));
2415+
eth_hw_addr_set(dev, addr);
24142416

24152417
if (!is_valid_ether_addr(dev->dev_addr)) {
24162418
err_msg = "Could not obtain valid ethernet address, aborting";

0 commit comments

Comments
 (0)