[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <f7ba8d47-f768-4a5d-e333-725f7bae1c6e@linux.dev>
Date: Wed, 27 Sep 2023 15:19:58 -0700
From: Martin KaFai Lau <martin.lau@...ux.dev>
To: Daan De Meyer <daan.j.demeyer@...il.com>
Cc: kernel-team@...a.com, netdev@...r.kernel.org, bpf@...r.kernel.org
Subject: Re: [PATCH bpf-next v6 2/9] bpf: Propagate modified uaddrlen from
cgroup sockaddr programs
On 9/26/23 1:27 PM, Daan De Meyer wrote:
> diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
> index 5b2741aa0d9b..ba2c57cf4046 100644
> --- a/kernel/bpf/cgroup.c
> +++ b/kernel/bpf/cgroup.c
> @@ -1449,6 +1449,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);
> * provided by user sockaddr
> * @sk: sock struct that will use sockaddr
> * @uaddr: sockaddr struct provided by user
> + * @uaddrlen: Pointer to the size of the sockaddr struct provided by user
This set cannot be applied cleanly. Please rebase. It has a conflict with:
commit 214bfd267f4929722b374b43fda456c21cd6f016
Author: Randy Dunlap <rdunlap@...radead.org>
AuthorDate: Mon Sep 11 23:08:12 2023
> * @type: The type of program to be executed
> * @t_ctx: Pointer to attach type specific context
> * @flags: Pointer to u32 which contains higher bits of BPF program
While updating the comment for __cgroup_bpf_run_filter_sock_addr, please also
mention that the uaddrlen is readonly for AF_INET[6] and will not be changed.
> @@ -1461,6 +1462,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);
> */
> int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,
> struct sockaddr *uaddr,
> + int *uaddrlen,
> enum cgroup_bpf_attach_type atype,
> void *t_ctx,
> u32 *flags)
Powered by blists - more mailing lists