Commit 5e3f5b81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf and netfilter.

  Current release - regressions:

   - veth: fix packet segmentation in veth_convert_skb_to_xdp_buff

  Current release - new code bugs:

   - tcp: assorted fixes to the new Auth Option support

  Older releases - regressions:

   - tcp: fix mid stream window clamp

   - tls: fix incorrect splice handling

   - ipv4: ip_gre: handle skb_pull() failure in ipgre_xmit()

   - dsa: mv88e6xxx: restore USXGMII support for 6393X

   - arcnet: restore support for multiple Sohard Arcnet cards

  Older releases - always broken:

   - tcp: do not accept ACK of bytes we never sent

   - require admin privileges to receive packet traces via netlink

   - packet: move reference count in packet_sock to atomic_long_t

   - bpf:
      - fix incorrect branch offset comparison with cpu=v4
      - fix prog_array_map_poke_run map poke update

   - netfilter:
      - three fixes for crashes on bad admin commands
      - xt_owner: fix race accessing sk->sk_socket, TOCTOU null-deref
      - nf_tables: fix 'exist' matching on bigendian arches

   - leds: netdev: fix RTNL handling to prevent potential deadlock

   - eth: tg3: prevent races in error/reset handling

   - eth: r8169: fix rtl8125b PAUSE storm when suspended

   - eth: r8152: improve reset and surprise removal handling

   - eth: hns: fix race between changing features and sending

   - eth: nfp: fix sleep in atomic for bonding offload"

* tag 'net-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (62 commits)
  vsock/virtio: fix "comparison of distinct pointer types lacks a cast" warning
  net/smc: fix missing byte order conversion in CLC handshake
  net: dsa: microchip: provide a list of valid protocols for xmit handler
  drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group
  psample: Require 'CAP_NET_ADMIN' when joining "packets" group
  bpf: sockmap, updating the sg structure should also update curr
  net: tls, update curr on splice as well
  nfp: flower: fix for take a mutex lock in soft irq context and rcu lock
  net: dsa: mv88e6xxx: Restore USXGMII support for 6393X
  tcp: do not accept ACK of bytes we never sent
  selftests/bpf: Add test for early update in prog_array_map_poke_run
  bpf: Fix prog_array_map_poke_run map poke update
  netfilter: xt_owner: Fix for unsafe access of sk->sk_socket
  netfilter: nf_tables: validate family when identifying table via handle
  netfilter: nf_tables: bail out on mismatching dynset and set expressions
  netfilter: nf_tables: fix 'exist' matching on bigendian arches
  netfilter: nft_set_pipapo: skip inactive elements during set walk
  netfilter: bpf: fix bad registration on nf_defrag
  leds: trigger: netdev: fix RTNL handling to prevent potential deadlock
  octeontx2-af: Update Tx link register range
  ...
parents 9ace34a8 b0a930e8

Documentation/networking/tcp_ao.rst

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ also [6.1]:: 
   when it is no longer considered permitted.



Linux TCP-AO will try its best to prevent you from removing a key that's

being used, considering it a key management failure. But sine keeping

being used, considering it a key management failure. But since keeping

an outdated key may become a security issue and as a peer may

unintentionally prevent the removal of an old key by always setting

it as RNextKeyID - a forced key removal mechanism is provided, where

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -15066,6 +15066,7 @@ F: lib/random32.c 
F:	net/

F:	tools/net/

F:	tools/testing/selftests/net/

X:	net/9p/

X:	net/bluetooth/









NETWORKING [IPSEC]
































arch/x86/net/bpf_jit_comp.c



+46
−0






























Original line number
Diff line number
Diff line







@@ -3025,3 +3025,49 @@ void arch_bpf_stack_walk(bool (*consume_fn)(void *cookie, u64 ip, u64 sp, u64 bp







#endif









	WARN(1, "verification of programs using bpf_throw should have failed\n");









}



















void bpf_arch_poke_desc_update(struct bpf_jit_poke_descriptor *poke,









			       struct bpf_prog *new, struct bpf_prog *old)









{









	u8 *old_addr, *new_addr, *old_bypass_addr;









	int ret;



















	old_bypass_addr = old ? NULL : poke->bypass_addr;









	old_addr = old ? (u8 *)old->bpf_func + poke->adj_off : NULL;









	new_addr = new ? (u8 *)new->bpf_func + poke->adj_off : NULL;



















	/*









	 * On program loading or teardown, the program's kallsym entry









	 * might not be in place, so we use __bpf_arch_text_poke to skip









	 * the kallsyms check.









	 */









	if (new) {









		ret = __bpf_arch_text_poke(poke->tailcall_target,









					   BPF_MOD_JUMP,









					   old_addr, new_addr);









		BUG_ON(ret < 0);









		if (!old) {









			ret = __bpf_arch_text_poke(poke->tailcall_bypass,









						   BPF_MOD_JUMP,









						   poke->bypass_addr,









						   NULL);









			BUG_ON(ret < 0);









		}









	} else {









		ret = __bpf_arch_text_poke(poke->tailcall_bypass,









					   BPF_MOD_JUMP,









					   old_bypass_addr,









					   poke->bypass_addr);









		BUG_ON(ret < 0);









		/* let other CPUs finish the execution of program









		 * so that it will not possible to expose them









		 * to invalid nop, stack unwind, nop state









		 */









		if (!ret)









			synchronize_rcu();









		ret = __bpf_arch_text_poke(poke->tailcall_target,









					   BPF_MOD_JUMP,









					   old_addr, NULL);









		BUG_ON(ret < 0);









	}









}
























drivers/leds/trigger/ledtrig-netdev.c



+7
−4






























Original line number
Diff line number
Diff line







@@ -226,6 +226,11 @@ static int set_device_name(struct led_netdev_data *trigger_data,

















	cancel_delayed_work_sync(&trigger_data->work);



















	/*









	 * Take RTNL lock before trigger_data lock to prevent potential









	 * deadlock with netdev notifier registration.









	 */









	rtnl_lock();









	mutex_lock(&trigger_data->lock);



















	if (trigger_data->net_dev) {








@@ -245,16 +250,14 @@ static int set_device_name(struct led_netdev_data *trigger_data,







	trigger_data->carrier_link_up = false;









	trigger_data->link_speed = SPEED_UNKNOWN;









	trigger_data->duplex = DUPLEX_UNKNOWN;









	if (trigger_data->net_dev != NULL) {









		rtnl_lock();









	if (trigger_data->net_dev)









		get_device_state(trigger_data);









		rtnl_unlock();









	}



















	trigger_data->last_activity = 0;



















	set_baseline_state(trigger_data);









	mutex_unlock(&trigger_data->lock);









	rtnl_unlock();



















	return 0;









}
































drivers/net/arcnet/arcdevice.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -186,6 +186,8 @@ do {									\







#define ARC_IS_5MBIT    1   /* card default speed is 5MBit */









#define ARC_CAN_10MBIT  2   /* card uses COM20022, supporting 10MBit,









				 but default is 2.5MBit. */









#define ARC_HAS_LED     4   /* card has software controlled LEDs */









#define ARC_HAS_ROTARY  8   /* card has rotary encoder */



















/* information needed to define an encapsulation driver */









struct ArcProto {