From: Martin KaFai Lau <martin.lau@linux.dev>
To: Daan De Meyer <daan.j.demeyer@gmail.com>
Cc: kernel-team@meta.com, netdev@vger.kernel.org, bpf@vger.kernel.org
Subject: Re: [PATCH bpf-next v6 2/9] bpf: Propagate modified uaddrlen from cgroup sockaddr programs
Date: Wed, 27 Sep 2023 15:19:58 -0700 [thread overview]
Message-ID: <f7ba8d47-f768-4a5d-e333-725f7bae1c6e@linux.dev> (raw)
In-Reply-To: <20230926202753.1482200-3-daan.j.demeyer@gmail.com>
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@infradead.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)
next prev parent reply other threads:[~2023-09-27 22:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 20:27 [PATCH bpf-next v6 0/9] Add cgroup sockaddr hooks for unix sockets Daan De Meyer
2023-09-26 20:27 ` [PATCH bpf-next v6 1/9] selftests/bpf: Add missing section name tests for getpeername/getsockname Daan De Meyer
2023-09-26 20:27 ` [PATCH bpf-next v6 2/9] bpf: Propagate modified uaddrlen from cgroup sockaddr programs Daan De Meyer
2023-09-27 22:19 ` Martin KaFai Lau [this message]
2023-09-26 20:27 ` [PATCH bpf-next v6 3/9] bpf: Add bpf_sock_addr_set_unix_addr() to allow writing unix sockaddr from bpf Daan De Meyer
2023-09-26 20:27 ` [PATCH bpf-next v6 4/9] bpf: Implement cgroup sockaddr hooks for unix sockets Daan De Meyer
2023-09-27 22:32 ` Martin KaFai Lau
2023-09-26 20:27 ` [PATCH bpf-next v6 5/9] libbpf: Add support for cgroup unix socket address hooks Daan De Meyer
2023-09-26 20:27 ` [PATCH bpf-next v6 6/9] bpftool: " Daan De Meyer
2023-09-27 8:26 ` Quentin Monnet
2023-09-26 20:27 ` [PATCH bpf-next v6 7/9] documentation/bpf: Document " Daan De Meyer
2023-09-26 20:27 ` [PATCH bpf-next v6 8/9] selftests/bpf: Make sure mount directory exists Daan De Meyer
2023-09-26 20:27 ` [PATCH bpf-next v6 9/9] selftests/bpf: Add tests for cgroup unix socket address hooks Daan De Meyer
2023-09-27 22:36 ` Martin KaFai Lau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f7ba8d47-f768-4a5d-e333-725f7bae1c6e@linux.dev \
--to=martin.lau@linux.dev \
--cc=bpf@vger.kernel.org \
--cc=daan.j.demeyer@gmail.com \
--cc=kernel-team@meta.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).