mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-22 03:04:34 +01:00
e24ff5c99b
The functions like gmtime(3) expect to cache a GMT time zone. Some sandboxed programs (like last(1)) use the gmtime(3) function. In case of last(1), this function fails to load a proper time zone because it is called after entering the capability mode. _open () at _open.S:4 0x00000008011bc5a8 in tzloadbody (name=0x8018b9580 "/usr/share/zoneinfo/Etc/UTC", sp=0x801870140, tzload (name=<optimized out>, sp=0x801870140, doextend=true) 0x00000008011bb8ba in gmtload (sp=0x801870140) at /usr/src/contrib/tzcode/localtime.c:1456 gmtcheck () at /usr/src/contrib/tzcode/localtime.c:1581 0x000000080111f85a in _libc_once (once_control=0x80127c550, init_routine=0x0) _once (once_control=0x80127c550, init_routine=0x0) at /usr/src/lib/libc/gen/_once_stub.c:63 0x00000008011bb9d0 in gmtime_r (timep=0x7fffffffe3a8, tmp=0x80127c568) gmtime (timep=timep@entry=0x7fffffffe3a8) at /usr/src/contrib/tzcode/localtime.c:1865 0x0000000001024cd4 in printentry (bp=bp@entry=0x8018b4800, tt=tt@entry=0x80186a0a0) 0x00000000010245ae in doentry (bp=0x8018b4800) 0x00000000010243a7 in main (argc=1, argv=<optimized out>) This time zone is not loaded by the tzset(3) function. Because of that, extend the caph_cache_tzdata(3) function to also include the GMT time zone. There is no other way to cache this data than calling gmtime(3) once. MFC after: 5 days Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D45297
206 lines
4.6 KiB
C
206 lines
4.6 KiB
C
/*-
|
|
* Copyright (c) 2016 Mariusz Zaborski <oshogbo@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _CAPSICUM_HELPERS_H_
|
|
#define _CAPSICUM_HELPERS_H_
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/capsicum.h>
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <errno.h>
|
|
#include <nl_types.h>
|
|
#include <termios.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
|
|
#include <libcasper.h>
|
|
|
|
#define CAPH_IGNORE_EBADF 0x0001
|
|
#define CAPH_READ 0x0002
|
|
#define CAPH_WRITE 0x0004
|
|
#define CAPH_LOOKUP 0x0008
|
|
|
|
__BEGIN_DECLS
|
|
|
|
static const unsigned long caph_stream_cmds[] =
|
|
{
|
|
#ifdef TIOCGETA
|
|
TIOCGETA,
|
|
#endif
|
|
#ifdef TIOCGWINSZ
|
|
TIOCGWINSZ,
|
|
#endif
|
|
#ifdef FIODTYPE
|
|
FIODTYPE,
|
|
#endif
|
|
};
|
|
static const uint32_t caph_stream_fcntls = CAP_FCNTL_GETFL;
|
|
|
|
static __inline void
|
|
caph_stream_rights(cap_rights_t *rights, int flags)
|
|
{
|
|
|
|
cap_rights_init(rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT,
|
|
CAP_IOCTL, CAP_SEEK);
|
|
|
|
if ((flags & CAPH_READ) != 0)
|
|
cap_rights_set(rights, CAP_READ);
|
|
if ((flags & CAPH_WRITE) != 0)
|
|
cap_rights_set(rights, CAP_WRITE);
|
|
if ((flags & CAPH_LOOKUP) != 0)
|
|
cap_rights_set(rights, CAP_LOOKUP);
|
|
}
|
|
|
|
static __inline int
|
|
caph_limit_stream(int fd, int flags)
|
|
{
|
|
cap_rights_t rights;
|
|
|
|
caph_stream_rights(&rights, flags);
|
|
if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) {
|
|
if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0)
|
|
return (0);
|
|
return (-1);
|
|
}
|
|
|
|
if (cap_ioctls_limit(fd, caph_stream_cmds,
|
|
nitems(caph_stream_cmds)) < 0 && errno != ENOSYS)
|
|
return (-1);
|
|
|
|
if (cap_fcntls_limit(fd, caph_stream_fcntls) < 0 && errno != ENOSYS)
|
|
return (-1);
|
|
|
|
return (0);
|
|
}
|
|
|
|
static __inline int
|
|
caph_limit_stdin(void)
|
|
{
|
|
|
|
return (caph_limit_stream(STDIN_FILENO, CAPH_READ));
|
|
}
|
|
|
|
static __inline int
|
|
caph_limit_stderr(void)
|
|
{
|
|
|
|
return (caph_limit_stream(STDERR_FILENO, CAPH_WRITE));
|
|
}
|
|
|
|
static __inline int
|
|
caph_limit_stdout(void)
|
|
{
|
|
|
|
return (caph_limit_stream(STDOUT_FILENO, CAPH_WRITE));
|
|
}
|
|
|
|
static __inline int
|
|
caph_limit_stdio(void)
|
|
{
|
|
const int iebadf = CAPH_IGNORE_EBADF;
|
|
|
|
if (caph_limit_stream(STDIN_FILENO, CAPH_READ | iebadf) == -1 ||
|
|
caph_limit_stream(STDOUT_FILENO, CAPH_WRITE | iebadf) == -1 ||
|
|
caph_limit_stream(STDERR_FILENO, CAPH_WRITE | iebadf) == -1)
|
|
return (-1);
|
|
return (0);
|
|
}
|
|
|
|
static __inline void
|
|
caph_cache_tzdata(void)
|
|
{
|
|
time_t delta;
|
|
|
|
tzset();
|
|
|
|
/*
|
|
* The tzset() function does not cache all time zones.
|
|
* Some functions, such as gmtime(), require a GMT time zone.
|
|
* The only way to cache them is to call the function directly.
|
|
*/
|
|
delta = 0;
|
|
(void)gmtime(&delta);
|
|
}
|
|
|
|
static __inline void
|
|
caph_cache_catpages(void)
|
|
{
|
|
|
|
(void)catopen("libc", NL_CAT_LOCALE);
|
|
}
|
|
|
|
static __inline int
|
|
caph_enter(void)
|
|
{
|
|
|
|
if (cap_enter() < 0 && errno != ENOSYS)
|
|
return (-1);
|
|
|
|
return (0);
|
|
}
|
|
|
|
static __inline int
|
|
caph_rights_limit(int fd, const cap_rights_t *rights)
|
|
{
|
|
|
|
if (cap_rights_limit(fd, rights) < 0 && errno != ENOSYS)
|
|
return (-1);
|
|
|
|
return (0);
|
|
}
|
|
|
|
static __inline int
|
|
caph_ioctls_limit(int fd, const unsigned long *cmds, size_t ncmds)
|
|
{
|
|
|
|
if (cap_ioctls_limit(fd, cmds, ncmds) < 0 && errno != ENOSYS)
|
|
return (-1);
|
|
|
|
return (0);
|
|
}
|
|
|
|
static __inline int
|
|
caph_fcntls_limit(int fd, uint32_t fcntlrights)
|
|
{
|
|
|
|
if (cap_fcntls_limit(fd, fcntlrights) < 0 && errno != ENOSYS)
|
|
return (-1);
|
|
|
|
return (0);
|
|
}
|
|
|
|
static __inline int
|
|
caph_enter_casper(void)
|
|
{
|
|
|
|
return (CASPER_SUPPORT == 0 ? 0 : caph_enter());
|
|
}
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* _CAPSICUM_HELPERS_H_ */
|