From 86eff0042bf0b9e6277b281c4f3a680d997790d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Mon, 17 Aug 2020 16:06:16 -0400 Subject: [PATCH] Revert "Fix: sessiond: erroneous user check logic in session_access_ok" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 4064563ea326f6f26d2c458009beb9ebdb3ba840. Signed-off-by: Jérémie Galarneau Change-Id: Ifbcfd0c18631cfca70b2ea85b16824bb26a2a446 --- src/bin/lttng-sessiond/session.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c index 3358648f6..95395c282 100644 --- a/src/bin/lttng-sessiond/session.c +++ b/src/bin/lttng-sessiond/session.c @@ -1303,13 +1303,7 @@ int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid) { assert(session); - if (uid == 0) { - return 1; - } - - return uid == session->uid && gid == session->gid; - - if ((uid != session->uid || gid != session->gid) && uid != 0) { + if (uid != session->uid && gid != session->gid && uid != 0) { return 0; } else { return 1; -- 2.34.1