diff options
| author | Geoffrey Thomas <gthomas@mokafive.com> | 2012-09-27 22:02:06 -0700 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2012-09-28 12:08:28 -0400 |
| commit | f68dbdc3e6f895012ce33939fb524accf31bcca5 (patch) | |
| tree | 339a3793646cf9e12aa1f5bf3e0e6a295f8702a7 | |
| parent | 57ae3670508bbf4ec57049de47c9cae727a64802 (diff) | |
activation-helper: Ensure DBUS_STARTER_ADDRESS is set correctly
The fix for CVE-2012-3524 filters out all environment variables if
libdbus is used from a setuid program, to prevent various spoofing
attacks.
Unfortunately, the activation helper is a setuid program linking
libdbus, and this creates a regression for launched programs using
DBUS_STARTER_ADDRESS, since it will no longer exist.
Fix this by hardcoding the starter address to the default system bus
address.
Signed-off-by: Geoffrey Thomas <gthomas@mokafive.com>
Signed-off-by: Colin Walters <walters@verbum.org>
| -rw-r--r-- | bus/activation-helper.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/bus/activation-helper.c b/bus/activation-helper.c index 7864e0fe..cbc00d2f 100644 --- a/bus/activation-helper.c +++ b/bus/activation-helper.c @@ -142,3 +142,5 @@ out_all: -/* Clears the environment, except for DBUS_STARTER_x */ +/* Clears the environment, except for DBUS_STARTER_x, + * which we hardcode to the system bus. + */ static dbus_bool_t @@ -146,7 +148,2 @@ clear_environment (DBusError *error) { - const char *starter_env = NULL; - - /* we save the starter */ - starter_env = _dbus_getenv ("DBUS_STARTER_ADDRESS"); - #ifndef ACTIVATION_LAUNCHER_TEST @@ -161,7 +158,4 @@ clear_environment (DBusError *error) - /* restore the starter */ - if (starter_env) - _dbus_setenv ("DBUS_STARTER_ADDRESS", starter_env); - - /* set the type, which must be system if we got this far */ + /* Ensure the bus is set to system */ + _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS); _dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system"); |