diff options
Diffstat (limited to 'intl/dcgettext.c')
| -rw-r--r-- | intl/dcgettext.c | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/intl/dcgettext.c b/intl/dcgettext.c index a79c1f52e2..777dd31d04 100644 --- a/intl/dcgettext.c +++ b/intl/dcgettext.c @@ -221,6 +221,24 @@ struct block_list # define DCGETTEXT dcgettext__ #endif +/* Checking whether the binaries runs SUID must be done and glibc provides + easier methods therefore we make a difference here. */ +#ifdef _LIBC +# define ENABLE_SECURE __libc_enable_secure +# define DETERMINE_SECURE +#else +static int enable_secure; +# define ENABLE_SECURE (enable_secure == 1) +# define DETERMINE_SECURE \ + if (enable_secure == 0) \ + { \ + if (getuid () != geteuid () || getgid () != getegid ()) \ + enable_secure = 1; \ + else \ + enable_secure = -1; \ + } +#endif + /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */ char * @@ -245,9 +263,12 @@ DCGETTEXT (domainname, msgid, category) if (msgid == NULL) return NULL; + /* See whether this is a SUID binary or not. */ + DETERMINE_SECURE; + /* If DOMAINNAME is NULL, we are interested in the default domain. If CATEGORY is not LC_MESSAGES this might not make much sense but the - defintion left this undefined. */ + definition left this undefined. */ if (domainname == NULL) domainname = _nl_current_default_domain; @@ -322,7 +343,7 @@ DCGETTEXT (domainname, msgid, category) /* Search for the given string. This is a loop because we perhaps - got an ordered list of languages to consider for th translation. */ + got an ordered list of languages to consider for the translation. */ while (1) { /* Make CATEGORYVALUE point to the next element of the list. */ @@ -343,6 +364,15 @@ DCGETTEXT (domainname, msgid, category) while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') *cp++ = *categoryvalue++; *cp = '\0'; + + /* When this is a SUID binary we must not allow accessing files + outside the dedicated directories. */ + if (ENABLE_SECURE + && (memchr (single_locale, '/', + _nl_find_language (single_locale) - single_locale) + != NULL)) + /* Ingore this entry. */ + continue; } /* If the current locale value is C (or POSIX) we don't load a |