From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 18 Feb 2021 13:42:15 +0000 (+0100)
Subject: bpf: fix return values in bpf_program_cgroup_attach()
X-Git-Tag: lxc-5.0.0~278^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d202c500d69202cbf458e55dab674193daee72b0;p=thirdparty%2Flxc.git

bpf: fix return values in bpf_program_cgroup_attach()

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

diff --git a/src/lxc/cgroups/cgroup2_devices.c b/src/lxc/cgroups/cgroup2_devices.c
index 57dbfbf8e..40ade62e4 100644
--- a/src/lxc/cgroups/cgroup2_devices.c
+++ b/src/lxc/cgroups/cgroup2_devices.c
@@ -385,14 +385,14 @@ int bpf_program_cgroup_attach(struct bpf_program *prog, int type, int fd_cgroup,
 
 	if (prog->fd_cgroup >= 0) {
 		if (prog->attached_type != type)
-			return log_error_errno(-1, EBUSY, "Wrong type for bpf program");
+			return syserrno_set(-EBUSY, "Wrong type for bpf program");
 
 		/*
 		 * For BPF_F_ALLOW_OVERRIDE the flags of the new and old
 		 * program must match.
 		 */
 		if ((flags & BPF_F_ALLOW_OVERRIDE) && (prog->attached_flags != flags))
-			return log_error_errno(-1, EBUSY, "Wrong flags for bpf program");
+			return syserrno_set(-EBUSY, "Wrong flags for bpf program");
 	}
 
 	/* Leave the caller's fd alone. */
@@ -402,7 +402,7 @@ int bpf_program_cgroup_attach(struct bpf_program *prog, int type, int fd_cgroup,
 
 	ret = bpf_program_load_kernel(prog);
 	if (ret < 0)
-		return log_error_errno(-1, ret, "Failed to load bpf program");
+		return syserrno(-errno, "Failed to load bpf program");
 
 	attr = &(union bpf_attr){
 		.attach_type	= type,
@@ -416,7 +416,7 @@ int bpf_program_cgroup_attach(struct bpf_program *prog, int type, int fd_cgroup,
 
 	ret = bpf(BPF_PROG_ATTACH, attr, sizeof(*attr));
 	if (ret < 0)
-		return syserrno_set(-errno, "Failed to attach bpf program");
+		return syserrno(-errno, "Failed to attach bpf program");
 
 	swap(prog->fd_cgroup, fd_attach);
 	prog->attached_type = type;