From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 18 Feb 2021 10:37:55 +0000 (+0100)
Subject: commands: rework bpf devices BPF_F_REPLACE codepath
X-Git-Tag: lxc-5.0.0~278^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2a38b3133c4b49b32e1b6a7aebcef3a2fd3f5d;p=thirdparty%2Flxc.git

commands: rework bpf devices BPF_F_REPLACE codepath

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 60315a5ac..0c7d6f1fd 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -1203,6 +1203,8 @@ static int lxc_cmd_add_bpf_device_cgroup_callback(int fd, struct lxc_cmd_req *re
 	struct lxc_conf *conf = handler->conf;
 	struct cgroup_ops *cgroup_ops = handler->cgroup_ops;
 	struct hierarchy *unified = cgroup_ops->unified;
+	int fd_replace = -EBADF;
+	__u32 flags = 0;
 	int ret;
 	struct lxc_list *it;
 	struct device_item *device;
@@ -1260,22 +1262,29 @@ static int lxc_cmd_add_bpf_device_cgroup_callback(int fd, struct lxc_cmd_req *re
 	if (ret)
 		goto respond;
 
+	flags |= BPF_F_ALLOW_MULTI;
+
 	devices_old = cgroup_ops->cgroup2_devices;
-	if (devices_old && devices_old->kernel_fd >= 0)
-		ret = bpf_program_cgroup_attach(devices,
-						BPF_CGROUP_DEVICE,
-					        unified->cgfd_limit,
-						devices_old->kernel_fd,
-						BPF_F_ALLOW_MULTI | BPF_F_REPLACE);
-	else
-		ret = bpf_program_cgroup_attach(devices,
-						BPF_CGROUP_DEVICE,
-					        unified->cgfd_limit,
-						-EBADF,
-						BPF_F_ALLOW_MULTI);
+	if (devices_old && devices_old->kernel_fd >= 0) {
+		flags |= BPF_F_REPLACE;
+		fd_replace = devices_old->kernel_fd;
+	}
+
+	ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE,
+					unified->cgfd_limit, fd_replace, flags);
 	if (ret)
 		goto respond;
 
+	/*
+	 * In case we replaced the current bpf program then we don't
+	 * need to detach anything. We simply need to close the old fd.
+	 */
+	if (devices_old && (flags & BPF_F_REPLACE)) {
+		close_prot_errno_disarm(devices_old->kernel_fd);
+		/* Technically not needed but better safe than segfaulted. */
+		fd_replace = -EBADF;
+	}
+
 	/* Replace old bpf program. */
 	devices_old = move_ptr(cgroup_ops->cgroup2_devices);
 	cgroup_ops->cgroup2_devices = move_ptr(devices);