Commit 23a46422 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents a0f90c88 fd20d973

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com> 
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ tcan4x5x: tcan4x5x@0 { 
		#address-cells = <1>;

		#size-cells = <1>;

		spi-max-frequency = <10000000>;

		bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;

		bosch,mram-cfg = <0x0 0 0 16 0 0 1 1>;

		interrupt-parent = <&gpio1>;

		interrupts = <14 IRQ_TYPE_LEVEL_LOW>;

		device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

MAINTAINERS

+19 −13
Original line number Diff line number Diff line
@@ -190,8 +190,9 @@ M: Johannes Berg <johannes@sipsolutions.net> 
L:	linux-wireless@vger.kernel.org

S:	Maintained

W:	https://wireless.wiki.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

Q:	https://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git

F:	Documentation/driver-api/80211/cfg80211.rst

F:	Documentation/networking/regulatory.rst

F:	include/linux/ieee80211.h
@@ -7208,8 +7209,10 @@ F: drivers/net/mdio/of_mdio.c 
F:	drivers/net/pcs/

F:	drivers/net/phy/

F:	include/dt-bindings/net/qca-ar803x.h

F:	include/linux/linkmode.h

F:	include/linux/*mdio*.h

F:	include/linux/mdio/*.h

F:	include/linux/mii.h

F:	include/linux/of_net.h

F:	include/linux/phy.h

F:	include/linux/phy_fixed.h
@@ -11366,8 +11369,9 @@ M: Johannes Berg <johannes@sipsolutions.net> 
L:	linux-wireless@vger.kernel.org

S:	Maintained

W:	https://wireless.wiki.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

Q:	https://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git

F:	Documentation/networking/mac80211-injection.rst

F:	Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst

F:	drivers/net/wireless/mac80211_hwsim.[ch]
@@ -13374,9 +13378,10 @@ NETWORKING DRIVERS (WIRELESS) 
M:	Kalle Valo <kvalo@kernel.org>

L:	linux-wireless@vger.kernel.org

S:	Maintained

Q:	http://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git

W:	https://wireless.wiki.kernel.org/

Q:	https://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git

F:	Documentation/devicetree/bindings/net/wireless/

F:	drivers/net/wireless/








@@ -13449,7 +13454,11 @@ L:	netdev@vger.kernel.org







S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git









F:	arch/x86/net/*









F:	include/linux/ip.h









F:	include/linux/ipv6*









F:	include/net/fib*









F:	include/net/ip*









F:	include/net/route.h









F:	net/ipv4/









F:	net/ipv6/
















@@ -13510,10 +13519,6 @@ F:	include/net/tls.h







F:	include/uapi/linux/tls.h









F:	net/tls/*

















NETWORKING [WIRELESS]









L:	linux-wireless@vger.kernel.org









Q:	http://patchwork.kernel.org/project/linux-wireless/list/

















NETXEN (1/10) GbE SUPPORT









M:	Manish Chopra <manishc@marvell.com>









M:	Rahul Verma <rahulv@marvell.com>








@@ -16532,8 +16537,9 @@ M:	Johannes Berg <johannes@sipsolutions.net>







L:	linux-wireless@vger.kernel.org









S:	Maintained









W:	https://wireless.wiki.kernel.org/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git









Q:	https://patchwork.kernel.org/project/linux-wireless/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git









F:	Documentation/ABI/stable/sysfs-class-rfkill









F:	Documentation/driver-api/rfkill.rst









F:	include/linux/rfkill.h
































drivers/connector/cn_proc.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -358,7 +358,7 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg,







	 * other namespaces.









	 */









	if ((current_user_ns() != &init_user_ns) ||









	    (task_active_pid_ns(current) != &init_pid_ns))









	    !task_is_in_init_pid_ns(current))









		return;



















	/* Can only change if privileged. */
































drivers/net/bonding/bond_main.c



+0
−4






























Original line number
Diff line number
Diff line







@@ -4133,9 +4133,7 @@ static int bond_eth_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cm

















		fallthrough;









	case SIOCGHWTSTAMP:









		rcu_read_lock();









		real_dev = bond_option_active_slave_get_rcu(bond);









		rcu_read_unlock();









		if (!real_dev)









			return -EOPNOTSUPP;


















@@ -5382,9 +5380,7 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,







	struct net_device *real_dev;









	struct phy_device *phydev;



















	rcu_read_lock();









	real_dev = bond_option_active_slave_get_rcu(bond);









	rcu_read_unlock();









	if (real_dev) {









		ops = real_dev->ethtool_ops;









		phydev = real_dev->phydev;