Commit 78a16058 authored Feb 04, 2026 by Martin KaFai Lau

Merge branch 'bpf-misc-changes-around-af_unix'

Kuniyuki Iwashima says:

====================
bpf: Misc changes around AF_UNIX.

Patch 1 adapts sk_is_XXX() helpers in __cgroup_bpf_run_filter_sock_addr().
Patch 2 removes an unnecessary sk_fullsock() in bpf_skc_to_unix_sock().
====================

Link: https://patch.msgid.link/20260203213442.682838-1-kuniyu@google.com


Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

parents b28dac3f c26b098b

kernel/bpf/cgroup.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -1680,11 +1680,7 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,
		struct cgroup *cgrp;
		int ret;

		/* Check socket family since not all sockets represent network
		* endpoint (e.g. AF_UNIX).
		*/
		if (sk->sk_family != AF_INET && sk->sk_family != AF_INET6 &&
		sk->sk_family != AF_UNIX)
		if (!sk_is_inet(sk) && !sk_is_unix(sk))
		return 0;

		if (!ctx.uaddr) {

net/core/filter.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -12021,7 +12021,7 @@ BPF_CALL_1(bpf_skc_to_unix_sock, struct sock *, sk)
		* trigger an explicit type generation here.
		*/
		BTF_TYPE_EMIT(struct unix_sock);
		if (sk && sk_fullsock(sk) && sk->sk_family == AF_UNIX)
		if (sk && sk_is_unix(sk))
		return (unsigned long)sk;

		return (unsigned long)NULL;