[PATCH net-next 0/2] net: a sockopt_t quirk for the options that write past optlen
From: Breno Leitao <leitao@debian.org>
Date: 2026-09-10 09:47:48
Also in:
lkml
This series continues the migration of our protocols to sockopt_t, as described in [1]. There are some protocols that use optlen as the header size, and the real buffer size comes from a field inside the header. This means a bug, given that optlen should be the full buffer size, but there are indications [2] that we have programs that use the bad behaviour above, and we want to avoid breaking them (or, honestly, avoid being cursed by Linus). That said, create a quirk helper that preserves the same behaviour, even using sockopt_t. The way to do it is simple: 1) Only do it for userspace callers (ubuf), otherwise a bug here will corrupt the kernel instead of a simple SIGSEGV. 2) Expand optval mid-air based on the header field. IP_MSFILTER is the first user, and the smallest one: a single caller, no compat variant, and a reply written front to back. MCAST_MSFILTER on ipv4 and ipv6 comes next, and TCP_AO_GET_KEYS has the same shape. Do this quirk on IP_MSFILTER to make sure the dynamic is ok, so, we can expand it later. None of this is meant to change what userspace sees. Link: https://lore.kernel.org/all/20260401-getsockopt-v2-0-611df6771aff@debian.org/ (local) [1] Link: https://lore.kernel.org/all/20260806-mcast_fix-v1-0-bed0a5518e57@debian.org/ (local) [2] Signed-off-by: Breno Leitao <leitao@debian.org> --- Breno Leitao (2): net: add sockopt_expand_out() ipv4: igmp: convert ip_mc_msfget() to sockopt_t include/linux/igmp.h | 3 ++- include/linux/net.h | 25 +++++++++++++++++++++++++ net/ipv4/igmp.c | 23 ++++++++++++++--------- net/ipv4/ip_sockglue.c | 10 +++++++++- net/socket.c | 4 ++-- 5 files changed, 52 insertions(+), 13 deletions(-) --- base-commit: 548b86839f7fb819a4d6c83b71c73ec378d24275 change-id: 20260909-getsockopt_phase6-c7c96a21b062 Best regards, -- Breno Leitao [off-list ref]