Pull networking fixes from David Miller: 1) Unbalanced locking in mwifiex_process_country_ie, from Brian Norris. 2) Fix thermal zone registration in iwlwifi, from Andrei Otcheretianski. 3) Fix double free_irq in sgi ioc3 eth, from Thomas Bogendoerfer. 4) Use after free in mptcp, from Florian Westphal. 5) Use after free in wireguard's root_remove_peer_lists, from Eric Dumazet. 6) Properly access packets heads in bonding alb code, from Eric Dumazet. 7) Fix data race in skb_queue_len(), from Qian Cai. 8) Fix regression in r8169 on some chips, from Heiner Kallweit. 9) Fix XDP program ref counting in hv_netvsc, from Haiyang Zhang. 10) Certain kinds of set link netlink operations can cause a NULL deref in the ipv6 addrconf code. Fix from Eric Dumazet. 11) Don't cancel uninitialized work queue in drop monitor, from Ido Schimmel. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (84 commits) net: thunderx: use proper interface type for RGMII mt76: mt7615: fix max_nss in mt7615_eeprom_parse_hw_cap bpf: Improve bucket_log calculation logic selftests/bpf: Test freeing sockmap/sockhash with a socket in it bpf, sockhash: Synchronize_rcu before free'ing map bpf, sockmap: Don't sleep while holding RCU lock on tear-down bpftool: Don't crash on missing xlated program instructions bpf, sockmap: Check update requirements after locking drop_monitor: Do not cancel uninitialized work item mlxsw: spectrum_dpipe: Add missing error path mlxsw: core: Add validation of hardware device types for MGPIR register mlxsw: spectrum_router: Clear offload indication from IPv6 nexthops on abort selftests: mlxsw: Add test cases for local table route replacement mlxsw: spectrum_router: Prevent incorrect replacement of local table routes net: dsa: microchip: enable module autoprobe ipv6/addrconf: fix potential NULL deref in inet6_set_link_af() dpaa_eth: support all modes with rate adapting PHYs net: stmmac: update pci platform data to use phy_interface net: stmmac: xgmac: fix missing IFF_MULTICAST checki in dwxgmac2_set_filter net: stmmac: fix missing IFF_MULTICAST check in dwmac4_set_filter ...
Showing the changes to include/linux (5 of 80 files). Show all
Unified · Split
| @@ -728,7 +728,7 @@ struct bpf_struct_ops { · 727 unmodified lines | ||
| 728 | 728 | #if defined(CONFIG_BPF_JIT) && defined(CONFIG_BPF_SYSCALL) |
| 729 | 729 | #define BPF_MODULE_OWNER ((void *)((0xeB9FUL << 2) + POISON_POINTER_DELTA)) |
| 730 | 730 | const struct bpf_struct_ops *bpf_struct_ops_find(u32 type_id); |
| 731 | −void bpf_struct_ops_init(struct btf *btf); | |
| 731 | +void bpf_struct_ops_init(struct btf *btf, struct bpf_verifier_log *log); | |
| 732 | 732 | bool bpf_struct_ops_get(const void *kdata); |
| 733 | 733 | void bpf_struct_ops_put(const void *kdata); |
| 734 | 734 | int bpf_struct_ops_map_sys_lookup_elem(struct bpf_map *map, void *key, |
| @@ -752,7 +752,10 @@ static inline const struct bpf_struct_ops *bpf_struct_ops_find(u32 type_id) · 17 unmodified lines | ||
| 752 | 752 | { |
| 753 | 753 | return NULL; |
| 754 | 754 | } |
| 755 | −static inline void bpf_struct_ops_init(struct btf *btf) { } | |
| 755 | +static inline void bpf_struct_ops_init(struct btf *btf, | |
| 756 | + struct bpf_verifier_log *log) | |
| 757 | +{ | |
| 758 | +} | |
| 756 | 759 | static inline bool bpf_try_module_get(const void *data, struct module *owner) |
| 757 | 760 | { |
| 758 | 761 | return try_module_get(owner); |
| @@ -1448,14 +1448,15 @@ struct mlx5_ifc_cmd_hca_cap_bits { · 1447 unmodified lines | ||
| 1448 | 1448 | |
| 1449 | 1449 | u8 reserved_at_440[0x20]; |
| 1450 | 1450 | |
| 1451 | − u8 tls[0x1]; | |
| 1452 | − u8 reserved_at_461[0x2]; | |
| 1451 | + u8 reserved_at_460[0x3]; | |
| 1453 | 1452 | u8 log_max_uctx[0x5]; |
| 1454 | 1453 | u8 reserved_at_468[0x3]; |
| 1455 | 1454 | u8 log_max_umem[0x5]; |
| 1456 | 1455 | u8 max_num_eqs[0x10]; |
| 1457 | 1456 | |
| 1458 | − u8 reserved_at_480[0x3]; | |
| 1457 | + u8 reserved_at_480[0x1]; | |
| 1458 | + u8 tls_tx[0x1]; | |
| 1459 | + u8 reserved_at_482[0x1]; | |
| 1459 | 1460 | u8 log_max_l2_table[0x5]; |
| 1460 | 1461 | u8 reserved_at_488[0x8]; |
| 1461 | 1462 | u8 log_uar_page_sz[0x10]; |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #ifndef __B53_H |
| 20 | 20 | #define __B53_H |
| 21 | 21 | |
| 22 | −#include <linux/kernel.h> | |
| 22 | +#include <linux/types.h> | |
| 23 | 23 | #include <linux/platform_data/dsa.h> |
| 24 | 24 | |
| 25 | 25 | struct b53_platform_data { |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #ifndef __MICROCHIP_KSZ_H |
| 20 | 20 | #define __MICROCHIP_KSZ_H |
| 21 | 21 | |
| 22 | −#include <linux/kernel.h> | |
| 22 | +#include <linux/types.h> | |
| 23 | 23 | |
| 24 | 24 | struct ksz_platform_data { |
| 25 | 25 | u32 chip_id; |
| @@ -1821,6 +1821,18 @@ static inline __u32 skb_queue_len(const struct sk_buff_head *list_) · 1820 unmodified lines | ||
| 1821 | 1821 | return list_->qlen; |
| 1822 | 1822 | } |
| 1823 | 1823 | |
| 1824 | +/** | |
| 1825 | + * skb_queue_len_lockless - get queue length | |
| 1826 | + * @list_: list to measure | |
| 1827 | + * | |
| 1828 | + * Return the length of an &sk_buff queue. | |
| 1829 | + * This variant can be used in lockless contexts. | |
| 1830 | + */ | |
| 1831 | +static inline __u32 skb_queue_len_lockless(const struct sk_buff_head *list_) | |
| 1832 | +{ | |
| 1833 | + return READ_ONCE(list_->qlen); | |
| 1834 | +} | |
| 1835 | + | |
| 1824 | 1836 | /** |
| 1825 | 1837 | * __skb_queue_head_init - initialize non-spinlock portions of sk_buff_head |
| 1826 | 1838 | * @list: queue to initialize |
| @@ -2026,7 +2038,7 @@ static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list) · 199 unmodified lines | ||
| 2026 | 2038 | { |
| 2027 | 2039 | struct sk_buff *next, *prev; |
| 2028 | 2040 | |
| 2029 | − list->qlen--; | |
| 2041 | + WRITE_ONCE(list->qlen, list->qlen - 1); | |
| 2030 | 2042 | next = skb->next; |
| 2031 | 2043 | prev = skb->prev; |
| 2032 | 2044 | skb->next = skb->prev = NULL; |