Commit f85c1598 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Fix sk_psock reference count leak on receive, from Xiyu Yang.

 2) CONFIG_HNS should be invisible, from Geert Uytterhoeven.

 3) Don't allow locking route MTUs in ipv6, RFCs actually forbid this,
    from Maciej Żenczykowski.

 4) ipv4 route redirect backoff wasn't actually enforced, from Paolo
    Abeni.

 5) Fix netprio cgroup v2 leak, from Zefan Li.

 6) Fix infinite loop on rmmod in conntrack, from Florian Westphal.

 7) Fix tcp SO_RCVLOWAT hangs, from Eric Dumazet.

 8) Various bpf probe handling fixes, from Daniel Borkmann.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (68 commits)
  selftests: mptcp: pm: rm the right tmp file
  dpaa2-eth: properly handle buffer size restrictions
  bpf: Restrict bpf_trace_printk()'s %s usage and add %pks, %pus specifier
  bpf: Add bpf_probe_read_{user, kernel}_str() to do_refine_retval_range
  bpf: Restrict bpf_probe_read{, str}() only to archs where they work
  MAINTAINERS: Mark networking drivers as Maintained.
  ipmr: Add lockdep expression to ipmr_for_each_table macro
  ipmr: Fix RCU list debugging warning
  drivers: net: hamradio: Fix suspicious RCU usage warning in bpqether.c
  net: phy: broadcom: fix BCM54XX_SHD_SCR3_TRDDAPD value for BCM54810
  tcp: fix error recovery in tcp_zerocopy_receive()
  MAINTAINERS: Add Jakub to networking drivers.
  MAINTAINERS: another add of Karsten Graul for S390 networking
  drivers: ipa: fix typos for ipa_smp2p structure doc
  pppoe: only process PADT targeted at local interfaces
  selftests/bpf: Enforce returning 0 for fentry/fexit programs
  bpf: Enforce returning 0 for fentry/fexit progs
  net: stmmac: fix num_por initialization
  security: Fix the default value of secid_to_secctx hook
  libbpf: Fix register naming in PT_REGS s390 macros
  ...
parents d5dfe4f1 8e138104

Documentation/core-api/printk-formats.rst

+14 −0
Original line number Diff line number Diff line
@@ -112,6 +112,20 @@ used when printing stack backtraces. The specifier takes into 
consideration the effect of compiler optimisations which may occur

when tail-calls are used and marked with the noreturn GCC attribute.



Probed Pointers from BPF / tracing

----------------------------------



::



	%pks	kernel string

	%pus	user string



The ``k`` and ``u`` specifiers are used for printing prior probed memory from

either kernel memory (k) or user memory (u). The subsequent ``s`` specifier

results in printing a string. For direct use in regular vsnprintf() the (k)

and (u) annotation is ignored, however, when used out of BPF's bpf_trace_printk(),

for example, it reads the memory it is pointing to without faulting.



Kernel Pointers

---------------

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -11710,8 +11710,9 @@ F: net/core/drop_monitor.c 














NETWORKING DRIVERS















M:	"David S. Miller" <davem@davemloft.net>













M:	Jakub Kicinski <kuba@kernel.org>















L:	netdev@vger.kernel.org













S:	Odd Fixes













S:	Maintained















W:	http://www.linuxfoundation.org/en/Net















Q:	http://patchwork.ozlabs.org/project/netdev/list/















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










@@ -14634,6 +14635,7 @@ F:	drivers/iommu/s390-iommu.c



























S390 IUCV NETWORK LAYER















M:	Julian Wiedmann <jwi@linux.ibm.com>













M:	Karsten Graul <kgraul@linux.ibm.com>















M:	Ursula Braun <ubraun@linux.ibm.com>















L:	linux-s390@vger.kernel.org















S:	Supported









@@ -14644,6 +14646,7 @@ F:	net/iucv/



























S390 NETWORK DRIVERS















M:	Julian Wiedmann <jwi@linux.ibm.com>













M:	Karsten Graul <kgraul@linux.ibm.com>















M:	Ursula Braun <ubraun@linux.ibm.com>















L:	linux-s390@vger.kernel.org















S:	Supported

































arch/arm/Kconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -12,6 +12,7 @@ config ARM













	select ARCH_HAS_KEEPINITRD















	select ARCH_HAS_KCOV















	select ARCH_HAS_MEMBARRIER_SYNC_CORE













	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE















	select ARCH_HAS_PTE_SPECIAL if ARM_LPAE















	select ARCH_HAS_PHYS_TO_DMA















	select ARCH_HAS_SETUP_DMA_OPS

































arch/arm/configs/keystone_defconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -147,6 +147,7 @@ CONFIG_I2C_DAVINCI=y













CONFIG_SPI=y















CONFIG_SPI_DAVINCI=y















CONFIG_SPI_SPIDEV=y













CONFIG_PTP_1588_CLOCK=y















CONFIG_PINCTRL_SINGLE=y















CONFIG_GPIOLIB=y















CONFIG_GPIO_SYSFS=y

































arch/arm/configs/omap2plus_defconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -274,6 +274,7 @@ CONFIG_SPI_TI_QSPI=m













CONFIG_HSI=m















CONFIG_OMAP_SSI=m















CONFIG_SSI_PROTOCOL=m













CONFIG_PTP_1588_CLOCK=y















CONFIG_PINCTRL_SINGLE=y















CONFIG_DEBUG_GPIO=y















CONFIG_GPIO_SYSFS=y









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE