[PATCH] bpf: Fix BPF_PROG_ASSOC_STRUCT_OPS last field check

[PATCH] bpf: Fix BPF_PROG_ASSOC_STRUCT_OPS last field check

[Thiébaud Weksteen]

When struct prog_assoc_struct_ops was added,
BPF_PROG_ASSOC_STRUCT_OPS_LAST_FIELD referenced prog_fd instead of the
actual last field, flags.

Fixes: b5709f6d26d6 ("bpf: Support associating BPF program with struct_ops")
Signed-off-by: Thiébaud Weksteen <tweek@google.com>
---
 kernel/bpf/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 630d530782fe..eb52ba57ffd5 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -6189,7 +6189,7 @@ static int prog_stream_read(union bpf_attr *attr)
 	return ret;
 }
 
-#define BPF_PROG_ASSOC_STRUCT_OPS_LAST_FIELD prog_assoc_struct_ops.prog_fd
+#define BPF_PROG_ASSOC_STRUCT_OPS_LAST_FIELD prog_assoc_struct_ops.flags
 
 static int prog_assoc_struct_ops(union bpf_attr *attr)
 {
-- 
2.54.0.1189.g8c84645362-goog

Re: [PATCH] bpf: Fix BPF_PROG_ASSOC_STRUCT_OPS last field check

[Jakub Sitnicki]

On Thu, Jun 18, 2026 at 02:09 PM +10, Thiébaud Weksteen wrote:
> When struct prog_assoc_struct_ops was added,
> BPF_PROG_ASSOC_STRUCT_OPS_LAST_FIELD referenced prog_fd instead of the
> actual last field, flags.
>
> Fixes: b5709f6d26d6 ("bpf: Support associating BPF program with struct_ops")
> Signed-off-by: Thiébaud Weksteen <tweek@google.com>
> ---

You need to indicate which tree the patch should go to [1].
bpf tree in this case since this is a fix.

Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>

[1] https://docs.kernel.org/bpf/bpf_devel_QA.html#q-how-do-i-indicate-which-tree-bpf-vs-bpf-next-my-patch-should-be-applied-to