Pull networking fixes from Jakub Kicinski: "Including fixes from bpf and netfilter. Current release - regressions: - bpf: fix crash due to out of bounds access into reg2btf_ids - mvpp2: always set port pcs ops, avoid null-deref - eth: marvell: fix driver load from initrd - eth: intel: revert "Fix reset bw limit when DCB enabled with 1 TC" Current release - new code bugs: - mptcp: fix race in overlapping signal events Previous releases - regressions: - xen-netback: revert hotplug-status changes causing devices to not be configured - dsa: - avoid call to __dev_set_promiscuity() while rtnl_mutex isn't held - fix panic when removing unoffloaded port from bridge - dsa: microchip: fix bridging with more than two member ports Previous releases - always broken: - bpf: - fix crash due to incorrect copy_map_value when both spin lock and timer are present in a single value - fix a bpf_timer initialization issue with clang - do not try bpf_msg_push_data with len 0 - add schedule points in batch ops - nf_tables: - unregister flowtable hooks on netns exit - correct flow offload action array size - fix a couple of memory leaks - vsock: don't check owner in vhost_vsock_stop() while releasing - gso: do not skip outer ip header in case of ipip and net_failover - smc: use a mutex for locking "struct smc_pnettable" - openvswitch: fix setting ipv6 fields causing hw csum failure - mptcp: fix race in incoming ADD_ADDR option processing - sysfs: add check for netdevice being present to speed_show - sched: act_ct: fix flow table lookup after ct clear or switching zones - eth: intel: fixes for SR-IOV forwarding offloads - eth: broadcom: fixes for selftests and error recovery - eth: mellanox: flow steering and SR-IOV forwarding fixes Misc: - make __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends not report freed skbs as drops - force inlining of checksum functions in net/checksum.h" * tag 'net-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (85 commits) net: mv643xx_eth: process retval from of_get_mac_address ping: remove pr_err from ping_lookup Revert "i40e: Fix reset bw limit when DCB enabled with 1 TC" openvswitch: Fix setting ipv6 fields causing hw csum failure ipv6: prevent a possible race condition with lifetimes net/smc: Use a mutex for locking "struct smc_pnettable" bnx2x: fix driver load from initrd Revert "xen-netback: Check for hotplug-status existence before watching" Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" net/mlx5e: Fix VF min/max rate parameters interchange mistake net/mlx5e: Add missing increment of count net/mlx5e: MPLSoUDP decap, fix check for unsupported matches net/mlx5e: Fix MPLSoUDP encap to use MPLS action information net/mlx5e: Add feature check for set fec counters net/mlx5e: TC, Skip redundant ct clear actions net/mlx5e: TC, Reject rules with forward and drop actions net/mlx5e: TC, Reject rules with drop and modify hdr action net/mlx5e: kTLS, Use CHECKSUM_UNNECESSARY for device-offloaded packets net/mlx5e: Fix wrong return value on ioctl EEPROM query failure net/mlx5: Fix possible deadlock on rule deletion ...
Showing the changes to include/linux (1 of 99 files). Show all
Unified · Split
| @@ -209,11 +209,9 @@ static inline bool map_value_has_timer(const struct bpf_map *map) · 208 unmodified lines | ||
| 209 | 209 | static inline void check_and_init_map_value(struct bpf_map *map, void *dst) |
| 210 | 210 | { |
| 211 | 211 | if (unlikely(map_value_has_spin_lock(map))) |
| 212 | − *(struct bpf_spin_lock *)(dst + map->spin_lock_off) = | |
| 213 | − (struct bpf_spin_lock){}; | |
| 212 | + memset(dst + map->spin_lock_off, 0, sizeof(struct bpf_spin_lock)); | |
| 214 | 213 | if (unlikely(map_value_has_timer(map))) |
| 215 | − *(struct bpf_timer *)(dst + map->timer_off) = | |
| 216 | − (struct bpf_timer){}; | |
| 214 | + memset(dst + map->timer_off, 0, sizeof(struct bpf_timer)); | |
| 217 | 215 | } |
| 218 | 216 | |
| 219 | 217 | /* copy everything but bpf_spin_lock and bpf_timer. There could be one of each. */ |
| @@ -224,7 +222,8 @@ static inline void copy_map_value(struct bpf_map *map, void *dst, void *src) · 4 unmodified lines | ||
| 224 | 222 | if (unlikely(map_value_has_spin_lock(map))) { |
| 225 | 223 | s_off = map->spin_lock_off; |
| 226 | 224 | s_sz = sizeof(struct bpf_spin_lock); |
| 227 | − } else if (unlikely(map_value_has_timer(map))) { | |
| 225 | + } | |
| 226 | + if (unlikely(map_value_has_timer(map))) { | |
| 228 | 227 | t_off = map->timer_off; |
| 229 | 228 | t_sz = sizeof(struct bpf_timer); |
| 230 | 229 | } |