# git rev-parse -q --verify 7ebfc85e2cd7b08f518b526173e9a33b56b3913b^{commit} 7ebfc85e2cd7b08f518b526173e9a33b56b3913b already have revision, skipping fetch # git checkout -q -f -B kisskb 7ebfc85e2cd7b08f518b526173e9a33b56b3913b # git clean -qxdf # < git log -1 # commit 7ebfc85e2cd7b08f518b526173e9a33b56b3913b # Merge: e091ba5cf827 c2e75634cbe3 # Author: Linus Torvalds # Date: Thu Aug 11 13:45:37 2022 -0700 # # Merge tag 'net-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from Jakub Kicinski: # "Including fixes from bluetooth, bpf, can and netfilter. # # A little larger than usual but it's all fixes, no late features. It's # large partially because of timing, and partially because of follow ups # to stuff that got merged a week or so before the merge window and # wasn't as widely tested. Maybe the Bluetooth fixes are a little # alarming so we'll address that, but the rest seems okay and not scary. # # Notably we're including a fix for the netfilter Kconfig [1], your WiFi # warning [2] and a bluetooth fix which should unblock syzbot [3]. # # Current release - regressions: # # - Bluetooth: # - don't try to cancel uninitialized works [3] # - L2CAP: fix use-after-free caused by l2cap_chan_put # # - tls: rx: fix device offload after recent rework # # - devlink: fix UAF on failed reload and leftover locks in mlxsw # # Current release - new code bugs: # # - netfilter: # - flowtable: fix incorrect Kconfig dependencies [1] # - nf_tables: fix crash when nf_trace is enabled # # - bpf: # - use proper target btf when exporting attach_btf_obj_id # - arm64: fixes for bpf trampoline support # # - Bluetooth: # - ISO: unlock on error path in iso_sock_setsockopt() # - ISO: fix info leak in iso_sock_getsockopt() # - ISO: fix iso_sock_getsockopt for BT_DEFER_SETUP # - ISO: fix memory corruption on iso_pinfo.base # - ISO: fix not using the correct QoS # - hci_conn: fix updating ISO QoS PHY # # - phy: dp83867: fix get nvmem cell fail # # Previous releases - regressions: # # - wifi: cfg80211: fix validating BSS pointers in # __cfg80211_connect_result [2] # # - atm: bring back zatm uAPI after ATM had been removed # # - properly fix old bug making bonding ARP monitor mode not being able # to work with software devices with lockless Tx # # - tap: fix null-deref on skb->dev in dev_parse_header_protocol # # - revert "net: usb: ax88179_178a needs FLAG_SEND_ZLP" it helps some # devices and breaks others # # - netfilter: # - nf_tables: many fixes rejecting cross-object linking which may # lead to UAFs # - nf_tables: fix null deref due to zeroed list head # - nf_tables: validate variable length element extension # # - bgmac: fix a BUG triggered by wrong bytes_compl # # - bcmgenet: indicate MAC is in charge of PHY PM # # Previous releases - always broken: # # - bpf: # - fix bad pointer deref in bpf_sys_bpf() injected via test infra # - disallow non-builtin bpf programs calling the prog_run command # - don't reinit map value in prealloc_lru_pop # - fix UAFs during the read of map iterator fd # - fix invalidity check for values in sk local storage map # - reject sleepable program for non-resched map iterator # # - mptcp: # - move subflow cleanup in mptcp_destroy_common() # - do not queue data on closed subflows # # - virtio_net: fix memory leak inside XDP_TX with mergeable # # - vsock: fix memory leak when multiple threads try to connect() # # - rework sk_user_data sharing to prevent psock leaks # # - geneve: fix TOS inheriting for ipv4 # # - tunnels & drivers: do not use RT_TOS for IPv6 flowlabel # # - phy: c45 baset1: do not skip aneg configuration if clock role is # not specified # # - rose: avoid overflow when /proc displays timer information # # - x25: fix call timeouts in blocking connects # # - can: mcp251x: fix race condition on receive interrupt # # - can: j1939: # - replace user-reachable WARN_ON_ONCE() with netdev_warn_once() # - fix memory leak of skbs in j1939_session_destroy() # # Misc: # # - docs: bpf: clarify that many things are not uAPI # # - seg6: initialize induction variable to first valid array index (to # silence clang vs objtool warning) # # - can: ems_usb: fix clang 14's -Wunaligned-access warning" # # * tag 'net-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (117 commits) # net: atm: bring back zatm uAPI # dpaa2-eth: trace the allocated address instead of page struct # net: add missing kdoc for struct genl_multicast_group::flags # nfp: fix use-after-free in area_cache_get() # MAINTAINERS: use my korg address for mt7601u # mlxsw: minimal: Fix deadlock in ports creation # bonding: fix reference count leak in balance-alb mode # net: usb: qmi_wwan: Add support for Cinterion MV32 # bpf: Shut up kern_sys_bpf warning. # net/tls: Use RCU API to access tls_ctx->netdev # tls: rx: device: don't try to copy too much on detach # tls: rx: device: bound the frag walk # net_sched: cls_route: remove from list when handle is 0 # selftests: forwarding: Fix failing tests with old libnet # net: refactor bpf_sk_reuseport_detach() # net: fix refcount bug in sk_psock_get (2) # selftests/bpf: Ensure sleepable program is rejected by hash map iter # selftests/bpf: Add write tests for sk local storage map iterator # selftests/bpf: Add tests for reading a dangling map iter fd # bpf: Only allow sleepable program for resched-able iterator # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 7ebfc85e2cd7b08f518b526173e9a33b56b3913b # < make -s -j 40 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 40 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 40 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 40 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/machvec.c: In function 'sh_mv_setup': /kisskb/src/arch/sh/kernel/machvec.c:105:33: error: array subscript 'struct sh_machine_vector[0]' is partly outside array bounds of 'long int[1]' [-Werror=array-bounds] 105 | sh_mv = *(struct sh_machine_vector *)&__machvec_start; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/sh/kernel/machvec.c:13: /kisskb/src/arch/sh/include/asm/sections.h:7:13: note: while referencing '__machvec_start' 7 | extern long __machvec_start, __machvec_end; | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sh/kernel/machvec.o] Error 1 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:596, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:31: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:9: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:9: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:34: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sh/kernel/cpu/sh2/setup-sh7619.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:465: arch/sh/kernel/cpu/sh2] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:465: arch/sh/kernel/cpu] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:465: arch/sh/kernel] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1855: arch/sh] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:222: __sub-make] Error 2 Command 'make -s -j 40 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh-allmodconfig_sh4-gcc11 # Build took: 0:01:11.098279