prevent CNAME/PTR parsing from reading data past the response end

[musl] / src / conf / sysconf.c

diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c
index 9ce330a..60d3e74 100644 (file)
--- a/src/conf/sysconf.c
+++ b/src/conf/sysconf.c
@@ -4,6 +4,7 @@
 #include <sys/resource.h>
 #include <signal.h>
 #include <sys/sysinfo.h>
+#include <sys/auxv.h>
 #include "syscall.h"
 #include "libc.h"
 
@@ -18,6 +19,9 @@
 #define JT_PHYS_PAGES JT(8)
 #define JT_AVPHYS_PAGES JT(9)
 #define JT_ZERO JT(10)
+#define JT_DELAYTIMER_MAX JT(11)
+#define JT_MINSIGSTKSZ JT(12)
+#define JT_SIGSTKSZ JT(13)
 
 #define RLIM(x) (-32768|(RLIMIT_ ## x))
 
@@ -33,7 +37,7 @@ long sysconf(int name)
                [_SC_TZNAME_MAX] = TZNAME_MAX,
                [_SC_JOB_CONTROL] = 1,
                [_SC_SAVED_IDS] = 1,
-               [_SC_REALTIME_SIGNALS] = 1,
+               [_SC_REALTIME_SIGNALS] = VER,
                [_SC_PRIORITY_SCHEDULING] = -1,
                [_SC_TIMERS] = VER,
                [_SC_ASYNCHRONOUS_IO] = VER,
@@ -50,7 +54,7 @@ long sysconf(int name)
                [_SC_AIO_LISTIO_MAX] = -1,
                [_SC_AIO_MAX] = -1,
                [_SC_AIO_PRIO_DELTA_MAX] = JT_ZERO, /* ?? */
-               [_SC_DELAYTIMER_MAX] = _POSIX_DELAYTIMER_MAX,
+               [_SC_DELAYTIMER_MAX] = JT_DELAYTIMER_MAX,
                [_SC_MQ_OPEN_MAX] = -1,
                [_SC_MQ_PRIO_MAX] = JT_MQ_PRIO_MAX,
                [_SC_VERSION] = VER,
@@ -111,8 +115,8 @@ long sysconf(int name)
                [_SC_XOPEN_XPG4] = -1,
                [_SC_NZERO] = NZERO,
                [_SC_XBS5_ILP32_OFF32] = -1,
-               [_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-               [_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+               [_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+               [_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
                [_SC_XBS5_LPBIG_OFFBIG] = -1,
                [_SC_XOPEN_LEGACY] = -1,
                [_SC_XOPEN_REALTIME] = -1,
@@ -141,8 +145,8 @@ long sysconf(int name)
                [_SC_STREAMS] = JT_ZERO,
                [_SC_2_PBS_CHECKPOINT] = -1,
                [_SC_V6_ILP32_OFF32] = -1,
-               [_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-               [_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+               [_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+               [_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
                [_SC_V6_LPBIG_OFFBIG] = -1,
                [_SC_HOST_NAME_MAX] = HOST_NAME_MAX,
                [_SC_TRACE] = -1,
@@ -153,8 +157,8 @@ long sysconf(int name)
                [_SC_IPV6] = VER,
                [_SC_RAW_SOCKETS] = VER,
                [_SC_V7_ILP32_OFF32] = -1,
-               [_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-               [_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+               [_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+               [_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
                [_SC_V7_LPBIG_OFFBIG] = -1,
                [_SC_SS_REPL_MAX] = -1,
                [_SC_TRACE_EVENT_NAME_MAX] = -1,
@@ -164,6 +168,9 @@ long sysconf(int name)
                [_SC_XOPEN_STREAMS] = JT_ZERO,
                [_SC_THREAD_ROBUST_PRIO_INHERIT] = -1,
                [_SC_THREAD_ROBUST_PRIO_PROTECT] = -1,
+
+               [_SC_MINSIGSTKSZ] = JT_MINSIGSTKSZ,
+               [_SC_SIGSTKSZ] = JT_SIGSTKSZ,
        };
 
        if (name >= sizeof(values)/sizeof(values[0]) || !values[name]) {
@@ -190,6 +197,8 @@ long sysconf(int name)
                return PAGE_SIZE;
        case JT_SEM_VALUE_MAX & 255:
                return SEM_VALUE_MAX;
+       case JT_DELAYTIMER_MAX & 255:
+               return DELAYTIMER_MAX;
        case JT_NPROCESSORS_CONF & 255:
        case JT_NPROCESSORS_ONLN & 255: ;
                unsigned char set[128] = {1};
@@ -201,7 +210,6 @@ long sysconf(int name)
        case JT_PHYS_PAGES & 255:
        case JT_AVPHYS_PAGES & 255: ;
                unsigned long long mem;
-               int __lsysinfo(struct sysinfo *);
                struct sysinfo si;
                __lsysinfo(&si);
                if (!si.mem_unit) si.mem_unit = 1;
@@ -210,6 +218,13 @@ long sysconf(int name)
                mem *= si.mem_unit;
                mem /= PAGE_SIZE;
                return (mem > LONG_MAX) ? LONG_MAX : mem;
+       case JT_MINSIGSTKSZ & 255:
+       case JT_SIGSTKSZ & 255: ;
+               long val = __getauxval(AT_MINSIGSTKSZ);
+               if (val < MINSIGSTKSZ) val = MINSIGSTKSZ;
+               if (values[name] == JT_SIGSTKSZ)
+                       val += SIGSTKSZ - MINSIGSTKSZ;
+               return val;
        case JT_ZERO & 255:
                return 0;
        }