Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jsauthority: do not query NoNewPrivileges for non-service units #500

Merged
merged 1 commit into from
Sep 26, 2024
Merged

jsauthority: do not query NoNewPrivileges for non-service units #500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 29 additions & 24 deletions src/polkitbackend/polkitbackendcommon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,31 +609,38 @@ polkit_backend_common_pidfd_to_systemd_unit (gint pidfd,

/* Check for NoNewPrivileges property being set on the unit via D-Bus, and
* return if it is not. This protects against PID changes, as if unset the
* unit could use a setuid binary. */
no_new_privs_result = g_dbus_connection_call_sync (connection,
"org.freedesktop.systemd1", /* name */
unit_path, /* object path */
"org.freedesktop.DBus.Properties", /* interface name */
"Get", /* method */
g_variant_new ("(ss)", "org.freedesktop.systemd1.Service", "NoNewPrivileges"),
G_VARIANT_TYPE ("(v)"),
G_DBUS_CALL_FLAGS_NONE,
-1,
NULL,
&error);

if (no_new_privs_result == NULL)
* unit could use a setuid binary. It is only valid for service units. */
if (g_str_has_suffix (unit, ".service"))
{
g_warning ("Error calling Get on NoNewPrivileges property for unit %s: %s", unit, error->message);
goto out;
}
no_new_privs_result = g_dbus_connection_call_sync (connection,
"org.freedesktop.systemd1", /* name */
unit_path, /* object path */
"org.freedesktop.DBus.Properties", /* interface name */
"Get", /* method */
g_variant_new ("(ss)", "org.freedesktop.systemd1.Service", "NoNewPrivileges"),
G_VARIANT_TYPE ("(v)"),
G_DBUS_CALL_FLAGS_NONE,
-1,
NULL,
&error);

if (no_new_privs_result == NULL)
{
g_warning ("Error calling Get on NoNewPrivileges property for unit %s: %s", unit, error->message);
goto out;
}

g_variant_get (no_new_privs_result, "(v)", &no_new_privis_value);
if (no_new_privis_value == NULL)
{
g_warning ("Error getting value for NoNewPrivileges property for unit %s", unit);
goto out;
g_variant_get (no_new_privs_result, "(v)", &no_new_privis_value);
if (no_new_privis_value == NULL)
{
g_warning ("Error getting value for NoNewPrivileges property for unit %s", unit);
goto out;
}

*ret_no_new_privs = g_variant_get_boolean (no_new_privis_value);
}
else
*ret_no_new_privs = FALSE;

*ret_unit = strdup (unit);
if (!*ret_unit)
Expand All @@ -642,8 +649,6 @@ polkit_backend_common_pidfd_to_systemd_unit (gint pidfd,
goto out;
}

*ret_no_new_privs = g_variant_get_boolean (no_new_privis_value);

out:
if (tmp_context)
{
Expand Down