Attachment 606064 Details for Bug 847402 – dbus: Use __secure_getenv

[patch] dbus: Use __secure_getenv

0001-Use-__secure_getenv-if-available-to-help-setuid-bina.patch (text/plain), 2.21 KB, created by Colin Walters on 2012-08-21 21:08:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2012-08-21 21:08:40 UTC

Size: 2.21 KB

patch

obsolete

>From b3c3d7a92b0bd9231e5afa2fb734bd13051c0326 Mon Sep 17 00:00:00 2001
>From: Sebastian Krahmer <krahmer@suse.de>
>Date: Tue, 21 Aug 2012 13:52:27 -0400
>Subject: [PATCH] Use __secure_getenv() if available to help setuid binaries
>
>(Commit message written by Colin Walters <walters@verbum.org>)
>
>Some setuid programs (like X.org) that don't explicitly clear their
>environment can be subject to attack via libdbus using environment
>variables such as DBUS_SYSTEM_BUS_ADDRESS.
>
>The DBus developers believe the burden lies on the maintainers of
>setuid binaries to either:
>
>1) Ensure all libraries they link to are safe to use while setuid,
>   and the authors guarantee this for the future
>2) Clear their environment
>
>However, because we can mitigate the problem here, we will do so.
>
>Note that this patch only helps glibc-using systems that export
>__secure_getenv().  Concretely, for example, FreeBSD and Android
>wouldn't be fixed by this patch.
>
>Signed-off-by: Colin Walters <walters@verbum.org>
>---
> configure.ac        | 2 +-
> dbus/dbus-sysdeps.c | 8 ++++++--
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index fee9db6..8f11cff 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -595,7 +595,7 @@ AC_DEFINE_UNQUOTED([DBUS_USE_SYNC], [$have_sync], [Use the gcc __sync extension]
> AC_SEARCH_LIBS(socket,[socket network])
> AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
> 
>-AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull)
>+AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull __secure_getenv)
> 
> AC_CHECK_HEADERS([syslog.h])
> if test "x$ac_cv_header_syslog_h" = "xyes"; then
>diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
>index 861bfec..34f9e6b 100644
>--- a/dbus/dbus-sysdeps.c
>+++ b/dbus/dbus-sysdeps.c
>@@ -181,8 +181,12 @@ _dbus_setenv (const char *varname,
>  */
> const char*
> _dbus_getenv (const char *varname)
>-{  
>-  return getenv (varname);
>+{
>+#ifdef HAVE___SECURE_GETENV
>+  return __secure_getenv(varname);
>+#else
>+  return getenv(varname);
>+#endif
> }
> 
> /**
>-- 
>1.7.11.2
>

Actions: View | Diff

Attachments on bug 847402: 606063 | 606064 | 606084 | 606355 | 606392