Commit 75439bc4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Networking fixes for 5.11-rc5, including fixes from bpf, wireless, and
  can trees.

  Current release - regressions:

   - nfc: nci: fix the wrong NCI_CORE_INIT parameters

  Current release - new code bugs:

   - bpf: allow empty module BTFs

  Previous releases - regressions:

   - bpf: fix signed_{sub,add32}_overflows type handling

   - tcp: do not mess with cloned skbs in tcp_add_backlog()

   - bpf: prevent double bpf_prog_put call from bpf_tracing_prog_attach

   - bpf: don't leak memory in bpf getsockopt when optlen == 0

   - tcp: fix potential use-after-free due to double kfree()

   - mac80211: fix encryption issues with WEP

   - devlink: use right genl user_ptr when handling port param get/set

   - ipv6: set multicast flag on the multicast route

   - tcp: fix TCP_USER_TIMEOUT with zero window

  Previous releases - always broken:

   - bpf: local storage helpers should check nullness of owner ptr passed

   - mac80211: fix incorrect strlen of .write in debugfs

   - cls_flower: call nla_ok() before nla_next()

   - skbuff: back tiny skbs with kmalloc() in __netdev_alloc_skb() too"

* tag 'net-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (52 commits)
  net: systemport: free dev before on error path
  net: usb: cdc_ncm: don't spew notifications
  net: mscc: ocelot: Fix multicast to the CPU port
  tcp: Fix potential use-after-free due to double kfree()
  bpf: Fix signed_{sub,add32}_overflows type handling
  can: peak_usb: fix use after free bugs
  can: vxcan: vxcan_xmit: fix use after free bug
  can: dev: can_restart: fix use after free bug
  tcp: fix TCP socket rehash stats mis-accounting
  net: dsa: b53: fix an off by one in checking "vlan->vid"
  tcp: do not mess with cloned skbs in tcp_add_backlog()
  selftests: net: fib_tests: remove duplicate log test
  net: nfc: nci: fix the wrong NCI_CORE_INIT parameters
  sh_eth: Fix power down vs. is_opened flag ordering
  net: Disable NETIF_F_HW_TLS_RX when RXCSUM is disabled
  netfilter: rpfilter: mask ecn bits before fib lookup
  udp: mask TOS bits in udp_v4_early_demux()
  xsk: Clear pool even for inactive queues
  bpf: Fix helper bpf_map_peek_elem_proto pointing to wrong callback
  sh_eth: Make PHY access aware of Runtime PM to fix reboot crash
  ...
parents 2e4ceed6 535d3159

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>

Documentation/networking/tls-offload.rst

+3 −0
Original line number Diff line number Diff line
@@ -534,3 +534,6 @@ offload. Hence, TLS TX device feature flag requires TX csum offload being set. 
Disabling the latter implies clearing the former. Disabling TX checksum offload

should not affect old connections, and drivers should make sure checksum

calculation does not break for them.

Similarly, device-offloaded TLS decryption implies doing RXCSUM. If the user

does not want to enable RX csum offload, TLS RX device feature is disabled

as well.

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3334,7 +3334,7 @@ F: arch/riscv/net/ 
X:	arch/riscv/net/bpf_jit_comp64.c









BPF JIT for RISC-V (64-bit)









M:	Björn Töpel <bjorn.topel@gmail.com>









M:	Björn Töpel <bjorn@kernel.org>









L:	netdev@vger.kernel.org









L:	bpf@vger.kernel.org









S:	Maintained








@@ -19416,7 +19416,7 @@ F:	drivers/net/ethernet/*/*/*xdp*







K:	(?:\b|_)xdp(?:\b|_)

















XDP SOCKETS (AF_XDP)









M:	Björn Töpel <bjorn.topel@intel.com>









M:	Björn Töpel <bjorn@kernel.org>









M:	Magnus Karlsson <magnus.karlsson@intel.com>









R:	Jonathan Lemon <jonathan.lemon@gmail.com>









L:	netdev@vger.kernel.org

























drivers/net/can/dev.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -592,11 +592,11 @@ static void can_restart(struct net_device *dev)

















	cf->can_id |= CAN_ERR_RESTARTED;



















	netif_rx_ni(skb);



















	stats->rx_packets++;









	stats->rx_bytes += cf->len;



















	netif_rx_ni(skb);



















restart:









	netdev_dbg(dev, "restarted\n");









	priv->can_stats.restarts++;
































drivers/net/can/usb/peak_usb/pcan_usb_fd.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -514,11 +514,11 @@ static int pcan_usb_fd_decode_canmsg(struct pcan_usb_fd_if *usb_if,







	else









		memcpy(cfd->data, rm->d, cfd->len);



















	peak_usb_netif_rx(skb, &usb_if->time_ref, le32_to_cpu(rm->ts_low));



















	netdev->stats.rx_packets++;









	netdev->stats.rx_bytes += cfd->len;



















	peak_usb_netif_rx(skb, &usb_if->time_ref, le32_to_cpu(rm->ts_low));



















	return 0;









}


















@@ -580,11 +580,11 @@ static int pcan_usb_fd_decode_status(struct pcan_usb_fd_if *usb_if,







	if (!skb)









		return -ENOMEM;



















	peak_usb_netif_rx(skb, &usb_if->time_ref, le32_to_cpu(sm->ts_low));



















	netdev->stats.rx_packets++;









	netdev->stats.rx_bytes += cf->len;



















	peak_usb_netif_rx(skb, &usb_if->time_ref, le32_to_cpu(sm->ts_low));



















	return 0;









}