Skip to contentSkip to conversation

bpf: prevent leak of lsm program after failed attach

PATCH Applied Milan Landaverde 3 participants 3 messages Dec 13, 2022 – Dec 14, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf: prevent leak of lsm program after failed attach

In [0], we added the ability to bpf_prog_attach LSM programs to cgroups, but in our validation to make sure the prog is meant to be attached to BPF_LSM_CGROUP, we return too early if the check fails. This results in lack of decrementing prog's refcnt (through bpf_prog_put) leaving the LSM program alive past the point of the expected lifecycle. This fix allows for the decrement to take place.

[0] https://lore.kernel.org/all/[email protected]/

Fixes 69fd337a975c ("bpf: per-cgroup lsm flavor")
---
 kernel/bpf/syscall.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/syscall.c +3 -3
index 35972afb6850..64131f88c553 100644
@@ -3518,9 +3518,9 @@ static int bpf_prog_attach(const union bpf_attr *attr)
 	case BPF_PROG_TYPE_LSM:
 		if (ptype == BPF_PROG_TYPE_LSM &&
 		    prog->expected_attach_type != BPF_LSM_CGROUP)
-			return -EINVAL;
-
-		ret = cgroup_bpf_prog_attach(attr, ptype, prog);
+			ret = -EINVAL;
+		else
+			ret = cgroup_bpf_prog_attach(attr, ptype, prog);
 		break;
 	default:
 		ret = -EINVAL;
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Milan Landaverde

In [0], we added the ability to bpf_prog_attach LSM programs to cgroups, but in our validation to make sure the prog is meant to be attached to BPF_LSM_CGROUP, we return too early if the check fails. This results in lack of decrementing prog's refcnt (through bpf_prog_put) leaving the LSM program alive past the point of the expected lifecycle. This fix allows for the decrement to take place.

Quoted 4 lines

[0] https://lore.kernel.org/all/[email protected]/

Fixes 69fd337a975c ("bpf: per-cgroup lsm flavor")

Makes sense, thank you!

Quoted 24 lines
---
 kernel/bpf/syscall.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/syscall.c +3 -4
index 35972afb6850..64131f88c553 100644
@@ -3518,9 +3518,9 @@ static int bpf_prog_attach(const union bpf_attr *attr)
        case BPF_PROG_TYPE_LSM:
                if (ptype == BPF_PROG_TYPE_LSM &&
                    prog->expected_attach_type != BPF_LSM_CGROUP)
-                       return -EINVAL;
-
-               ret = cgroup_bpf_prog_attach(attr, ptype, prog);
+                       ret = -EINVAL;
+               else
+                       ret = cgroup_bpf_prog_attach(attr, ptype, prog);
                break;
        default:
                ret = -EINVAL;
--

2.34.1

#2 lore raw
In reply to Milan Landaverde
This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:

Quoted 8 lines · On Tue, 13 Dec 2022 12:57:14 -0500 you wrote:

In [0], we added the ability to bpf_prog_attach LSM programs to cgroups, but in our validation to make sure the prog is meant to be attached to BPF_LSM_CGROUP, we return too early if the check fails. This results in lack of decrementing prog's refcnt (through bpf_prog_put) leaving the LSM program alive past the point of the expected lifecycle. This fix allows for the decrement to take place.

[...]

Here is the summary with links:
- [bpf-next] bpf: prevent leak of lsm program after failed attach

    https://git.kernel.org/bpf/bpf-next/c/2958c237fd1e

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html