Lorenz Bauer
0802a05ee7
BACKPORT: bpf: sockmap: Move generic sockmap hooks from BPF TCP ...
The init, close and unhash handlers from TCP sockmap are generic,
and can be reused by UDP sockmap. Move the helpers into the sockmap code
base and expose them. This requires tcp_bpf_get_proto and tcp_bpf_clone to
be conditional on BPF_STREAM_PARSER.
The moved functions are unmodified, except that sk_psock_unlink is
renamed to sock_map_unlink to better match its behaviour.
Change-Id: I54a6692b3e357efc09dedf1a6a55724c844aea74
Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20200309111243.6982-6-lmb@cloudflare.com
2025-12-23 13:36:03 -08:00
This is the 5.4.279 stable release
2024-07-08 13:55:50 +00:00
net: caif: add proper error handling
2021-06-10 13:37:09 +02:00
netfilter: nf_tables: do not defer rule destruction via call_rcu
2025-06-04 14:32:36 +02:00
Revert "ipv6: make ip6_rt_gc_expire an atomic_t"
2024-01-17 08:04:30 +00:00
net: nfc: nci: Increase NCI_DATA_TIMEOUT to 3000 ms
2025-12-03 12:45:11 +01:00
sctp: detect and prevent references to a freed transport in sendmsg
2025-05-02 07:39:16 +02:00
Merge android11-5.4.197+ ( 3970bc6) into msm-5.4
2022-08-16 16:52:01 +05:30
net: sched: extract qstats update code into functions
2025-08-28 16:21:36 +02:00
This is the 5.4.275 stable release
2024-05-15 16:00:38 +00:00
UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
2024-07-02 13:43:53 +03:00
ipv4: Invalidate neighbour for broadcast address upon address addition
2022-04-15 14:18:33 +02:00
ax25: fix reference count leaks of ax25_dev
2022-04-20 09:19:39 +02:00
bonding: fix data-races around agg_select_timer
2022-02-23 11:59:58 +01:00
bonding (gcc13): synchronize bond_{a,t}lb_xmit() types
2023-06-14 10:59:58 +02:00
bonding: fix macvlan over alb bond support
2023-08-30 16:27:24 +02:00
UPSTREAM: bpf: INET_DIAG support in bpf_sk_storage
2025-12-23 13:36:00 -08:00
net: busy-poll: use ktime_get_ns() instead of local_clock()
2024-09-04 13:15:03 +02:00
Merge tag 'ASB-2025-10-06_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-10-08 15:17:54 +03:00
net: Force inlining of checksum functions in net/checksum.h
2022-03-02 11:41:08 +01:00
net/cls_cgroup: Fix task_get_classid() during qdisc run
2025-12-03 12:45:12 +01:00
cnss2: Add API to send WFC mode to WLAN FW
2023-01-17 14:37:14 +05:30
Merge 5.4.248 into android11-5.4-lts
2023-06-22 16:16:24 +00:00
UPSTREAM: wireguard: device: reset peer src endpoint when netns exits
2025-09-24 12:16:39 +02:00
net: fix a memleak when uncloning an skb dst and its metadata
2022-02-16 12:52:51 +01:00
net: fix __dst_negative_advice() race
2024-06-16 13:28:52 +02:00
erspan: Add type I version 0 support.
2024-04-13 12:51:36 +02:00
esp: limit skb_page_frag_refill use to a single page
2022-07-12 16:30:45 +02:00
ANDROID: GKI: fix up abi breakage in fib_rules.h
2021-12-08 18:50:32 +01:00
Revert "inet: shrink struct flowi_common"
2023-11-27 17:25:07 +00:00
net: extract port range fields from fl_flow_key
2025-03-13 12:43:23 +01:00
net: extract port range fields from fl_flow_key
2025-03-13 12:43:23 +01:00
Revert "genetlink: hold RCU in genlmsg_mcast()"
2024-11-09 16:39:42 +00:00
net: ieee802154: return -EINVAL for unknown addr type
2022-10-26 13:22:59 +02:00
net: ipv6: support reporting otherwise unknown prefix flags in RTM_NEWPREFIX
2023-12-20 15:41:13 +01:00
This is the 5.4.290 stable release
2025-02-05 17:00:16 +00:00
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
2022-01-27 09:19:54 +01:00
secure_seq: use the 64 bits of the siphash for port offset calculation
2022-06-06 08:33:49 +02:00
tcp/dccp: Fix a data-race around sysctl_tcp_fwmark_accept.
2022-07-29 17:14:11 +02:00
Merge 5.4.245 into android11-5.4-lts
2023-06-20 16:54:26 +00:00
This is the 5.4.176 stable release
2022-02-01 17:48:27 +01:00
net: ipv6: fix returned variable type in ip6_skb_dst_mtu
2021-08-12 13:20:57 +02:00
ip_gre, ip6_gre: Fix race condition on o_seqno in collect_md mode
2023-05-30 12:44:05 +01:00
ipv4: convert fib_num_tclassid_users to atomic_t
2021-12-08 09:01:12 +01:00
Merge tag 'ASB-2025-12-01_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-12-04 19:21:35 +02:00
tcp: Reduce chance of collisions in inet6_hashfn().
2023-08-11 11:53:47 +02:00
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
2022-01-27 09:19:54 +01:00
Revert "net: ipv6: add fib6_nh_release_dsts stub"
2021-12-02 15:58:43 +01:00
kcm: Serialise kcm_sendmsg() for the same socket.
2024-09-04 13:14:59 +02:00
vrf: use RCU protection in l3mdev_l3_out()
2025-03-13 12:43:12 +01:00
net: lapb: increase LAPB_HEADER_LEN
2024-12-19 18:05:03 +01:00
llc: fix out-of-bound array index in llc_sk_dev_hash()
2021-11-17 09:48:47 +01:00
llc: Drop support for ETH_P_TR_802_2.
2024-02-23 08:24:50 +01:00
lwt: Check LWTUNNEL_XMIT_CONTINUE strictly
2023-09-23 10:59:42 +02:00
mac80211: Add support to trigger sta disconnect on hardware restart
2024-11-08 16:20:52 +01:00
net: macsec: allow to reference a netdev from a MACsec context
2022-01-24 15:38:50 -08:00
mrp: introduce active flags to prevent UAF when applicant uninit
2023-01-18 11:41:37 +01:00
Merge android11-5.4.249+ ( d57e792) into msm-5.4
2023-09-28 16:45:28 +05:30
This is the 5.4.291 stable release
2025-03-13 14:53:52 +00:00
net: ipv4: Fix rtnexthop len when RTA_FLOW is present
2021-10-06 15:42:33 +02:00
net: ieee802154: handle iftypes as u32
2021-12-01 09:23:32 +01:00
Revert "mm: fix struct page layout on 32-bit systems"
2021-05-20 10:55:38 +02:00
net/sched: sch_qfq: Fix null-deref in agg_dequeue
2025-12-03 12:45:04 +01:00
tcp/udp: Make early_demux back namespacified.
2022-11-10 17:57:55 +01:00
psample: Add a fwd declaration for skbuff
2021-08-18 08:56:59 +02:00
raw: Fix a data-race around sysctl_raw_l3mdev_accept.
2022-07-21 20:59:22 +02:00
ipv4: remove sparse error in ip_neigh_gw4()
2022-02-01 17:24:39 +01:00
Revert "net: rtnetlink: add msg kind names"
2025-10-31 07:58:56 +00:00
This is the 5.4.297 stable release
2025-09-02 10:52:40 +00:00
scm: fix MSG_CTRUNC setting condition for SO_PASSSEC
2023-05-17 11:35:41 +02:00
secure_seq: use the 64 bits of the siphash for port offset calculation
2022-06-06 08:33:49 +02:00
UPSTREAM: sock: Make sk_protocol a 16-bit value
2025-12-23 13:35:52 -08:00
UPSTREAM: net: Generate reuseport group ID on group creation
2025-12-23 13:35:57 -08:00
bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding
2021-11-17 09:48:48 +01:00
BACKPORT: bpf: sockmap: Move generic sockmap hooks from BPF TCP
2025-12-23 13:36:03 -08:00
ANDROID: add TEST_MAPPING for net/, include/net
2023-01-23 17:54:01 +00:00
This is the 5.4.157 stable release
2021-11-02 20:04:52 +01:00
This is the 5.4.297 stable release
2025-09-02 10:52:40 +00:00
udp: call udp_encap_enable for v6 sockets when enabling encap
2022-04-15 14:18:01 +02:00
tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().
2023-04-26 11:24:05 +02:00
vxlan: calculate correct header length for GPE
2023-08-11 11:53:47 +02:00
UPSTREAM: xsk: Make xskmap flush_list common for all map instances
2025-12-23 13:35:49 -08:00
This is the 5.4.276 stable release
2024-05-17 15:29:56 +00:00
0802a05ee7