upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tzcode: Don't treat TZDEFAULT as tainted

Browse source 
tzset() calls zoneinit() with the FROMENV flag set unconditionally, so
if TZ is unset and we use TZDEFAULT instead, we were still treating it
as if it came from the environment.  Unset the FROMENV flag if name is
null and we switch to TZDEFAULT, or if, after skipping the optional
leading colon, we find that name is identical to TZDEFAULT.

This incorporates upstream change d0e0b00f846c ("Avoid unnecessary
access, stat calls").

Fixes:		b6ea2513f7 ("tzcode: Limit TZ for setugid programs")
Event:		Oslo Hackathon 202508
Reviewed by:	philip
Differential Revision:	https://reviews.freebsd.org/D52240
This commit is contained in:
Dag-Erling Smørgrav 2025-09-01 08:33:28 +02:00
parent 004ce88ad1
commit ca89e15355
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
contrib/tzcode/localtime.c
View file

@ -615,6 +615,7 @@ tzloadbody(char const *name, struct state *sp, char tzloadflags,
name = TZDEFAULT;
if (! name)
return EINVAL;
tzloadflags &= ~TZLOAD_FROMENV;
}
if (name[0] == ':')
@ -670,11 +671,13 @@ tzloadbody(char const *name, struct state *sp, char tzloadflags,
fid = _open(name, (O_RDONLY | O_BINARY | O_CLOEXEC | O_CLOFORK
| O_IGNORE_CTTY | O_NOCTTY));
#else /* __FreeBSD__ */
if ((tzloadflags & TZLOAD_FROMENV) && strcmp(name, TZDEFAULT) == 0)
tzloadflags &= ~TZLOAD_FROMENV;
relname = name;
if (strncmp(relname, TZDIR "/", strlen(TZDIR) + 1) == 0)
relname += strlen(TZDIR) + 1;
dd = _open(TZDIR, O_DIRECTORY | O_RDONLY);
if (issetugid() && (tzloadflags & TZLOAD_FROMENV)) {
if ((tzloadflags & TZLOAD_FROMENV) && issetugid()) {
if (dd < 0)
return errno;
if (fstatat(dd, name, &sb, AT_RESOLVE_BENEATH) < 0) {
@ -1624,14 +1627,13 @@ zoneinit(struct state *sp, char const *name, char tzloadflags)
static void
tzset_unlocked(void)
{
char const *name = getenv("TZ");
#ifdef __FreeBSD__
tzset_unlocked_name(getenv("TZ"));
tzset_unlocked_name(name);
}
static void
tzset_unlocked_name(char const *name)
{
#else
char const *name = getenv("TZ");
#endif
struct state *sp = lclptr;
int lcl = name ? strlen(name) < sizeof lcl_TZname : -1;