Re: [PATCH bpf-next 2/2] bpf: Expose bpf_d_path helper to sleepable LSM hooks

2020-11-13 Thread Daniel Borkmann

On 11/13/20 4:18 AM, Yonghong Song wrote:



On 11/12/20 9:19 AM, KP Singh wrote:

From: KP Singh 

Sleepable hooks are never called from an NMI/interrupt context, so it is
safe to use the bpf_d_path helper in LSM programs attaching to these
hooks.

The helper is not restricted to sleepable programs and merely uses the
list of sleeable hooks as the initial subset of LSM hooks where it can


sleeable => sleepable

probably not need to resend if no other major changes. The maintainer
can just fix it up before merging.


Did while rebasing & applying, thanks everyone!


be used.

Signed-off-by: KP Singh 


Acked-by: Yonghong Song 




Re: [PATCH bpf-next 2/2] bpf: Expose bpf_d_path helper to sleepable LSM hooks

2020-11-12 Thread Yonghong Song




On 11/12/20 9:19 AM, KP Singh wrote:

From: KP Singh 

Sleepable hooks are never called from an NMI/interrupt context, so it is
safe to use the bpf_d_path helper in LSM programs attaching to these
hooks.

The helper is not restricted to sleepable programs and merely uses the
list of sleeable hooks as the initial subset of LSM hooks where it can


sleeable => sleepable

probably not need to resend if no other major changes. The maintainer
can just fix it up before merging.


be used.

Signed-off-by: KP Singh 


Acked-by: Yonghong Song 


Re: [PATCH bpf-next 2/2] bpf: Expose bpf_d_path helper to sleepable LSM hooks

2020-11-12 Thread Andrii Nakryiko
On Thu, Nov 12, 2020 at 9:20 AM KP Singh  wrote:
>
> From: KP Singh 
>
> Sleepable hooks are never called from an NMI/interrupt context, so it is
> safe to use the bpf_d_path helper in LSM programs attaching to these
> hooks.
>
> The helper is not restricted to sleepable programs and merely uses the
> list of sleeable hooks as the initial subset of LSM hooks where it can
> be used.
>
> Signed-off-by: KP Singh 
> ---

LGTM.

Acked-by: Andrii Nakryiko 


>  kernel/trace/bpf_trace.c | 7 ++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
> index e4515b0f62a8..eab1af02c90d 100644
> --- a/kernel/trace/bpf_trace.c
> +++ b/kernel/trace/bpf_trace.c
> @@ -16,6 +16,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include 
>  #include 
> @@ -1178,7 +1179,11 @@ BTF_SET_END(btf_allowlist_d_path)
>
>  static bool bpf_d_path_allowed(const struct bpf_prog *prog)
>  {
> -   return btf_id_set_contains(_allowlist_d_path, 
> prog->aux->attach_btf_id);
> +   if (prog->type == BPF_PROG_TYPE_LSM)
> +   return bpf_lsm_is_sleepable_hook(prog->aux->attach_btf_id);
> +
> +   return btf_id_set_contains(_allowlist_d_path,
> +  prog->aux->attach_btf_id);
>  }
>
>  BTF_ID_LIST_SINGLE(bpf_d_path_btf_ids, struct, path)
> --
> 2.29.2.222.g5d2a92d10f8-goog
>


[PATCH bpf-next 2/2] bpf: Expose bpf_d_path helper to sleepable LSM hooks

2020-11-12 Thread KP Singh
From: KP Singh 

Sleepable hooks are never called from an NMI/interrupt context, so it is
safe to use the bpf_d_path helper in LSM programs attaching to these
hooks.

The helper is not restricted to sleepable programs and merely uses the
list of sleeable hooks as the initial subset of LSM hooks where it can
be used.

Signed-off-by: KP Singh 
---
 kernel/trace/bpf_trace.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index e4515b0f62a8..eab1af02c90d 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1178,7 +1179,11 @@ BTF_SET_END(btf_allowlist_d_path)
 
 static bool bpf_d_path_allowed(const struct bpf_prog *prog)
 {
-   return btf_id_set_contains(_allowlist_d_path, 
prog->aux->attach_btf_id);
+   if (prog->type == BPF_PROG_TYPE_LSM)
+   return bpf_lsm_is_sleepable_hook(prog->aux->attach_btf_id);
+
+   return btf_id_set_contains(_allowlist_d_path,
+  prog->aux->attach_btf_id);
 }
 
 BTF_ID_LIST_SINGLE(bpf_d_path_btf_ids, struct, path)
-- 
2.29.2.222.g5d2a92d10f8-goog