- devel - example.com

[PATCH] libc/misc/getloadavg: Add getloadavg support to uClibc-ng
by lancethepants 23 May '22

23 May '22

This borrows getloadavg.c from musl. getloadavg pops up often. Recently llvm and rust are dependent on it. glibc and musl have it and no-one actually checks if it's available in your libc. It's just become way easier to add it in uclibc-ng rather than patch everything else. Signed-off-by: Lance Fredrickson <lancethepants(a)gmail.com> --- include/stdlib.h | 2 +- libc/misc/Makefile.in | 1 + libc/misc/getloadavg/Makefile | 13 +++++++++++ libc/misc/getloadavg/Makefile.in | 23 ++++++++++++++++++ libc/misc/getloadavg/getloadavg.c | 39 +++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 libc/misc/getloadavg/Makefile create mode 100644 libc/misc/getloadavg/Makefile.in create mode 100644 libc/misc/getloadavg/getloadavg.c diff --git a/include/stdlib.h b/include/stdlib.h index 6a253cc3f..987fe2223 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -979,7 +979,7 @@ extern int getpt (void); # endif #endif -#if 0 /* def __USE_BSD */ +#ifdef __USE_BSD /* Put the 1 minute, 5 minute and 15 minute load averages into the first NELEM elements of LOADAVG. Return the number written (never more than three, but may be less than NELEM), or -1 if an error occurred. */ diff --git a/libc/misc/Makefile.in b/libc/misc/Makefile.in index e45002e60..53bb6d6c8 100644 --- a/libc/misc/Makefile.in +++ b/libc/misc/Makefile.in @@ -14,6 +14,7 @@ include $(top_srcdir)libc/misc/file/Makefile.in include $(top_srcdir)libc/misc/fnmatch/Makefile.in include $(top_srcdir)libc/misc/ftw/Makefile.in include $(top_srcdir)libc/misc/fts/Makefile.in +include $(top_srcdir)libc/misc/getloadavg/Makefile.in include $(top_srcdir)libc/misc/glob/Makefile.in include $(top_srcdir)libc/misc/internals/Makefile.in include $(top_srcdir)libc/misc/locale/Makefile.in diff --git a/libc/misc/getloadavg/Makefile b/libc/misc/getloadavg/Makefile new file mode 100644 index 000000000..4a8f4a072 --- /dev/null +++ b/libc/misc/getloadavg/Makefile @@ -0,0 +1,13 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen <andersen(a)uclibc.org> +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +top_srcdir=../../../ +top_builddir=../../../ +all: objs +include $(top_builddir)Rules.mak +include Makefile.in +include $(top_srcdir)Makerules diff --git a/libc/misc/getloadavg/Makefile.in b/libc/misc/getloadavg/Makefile.in new file mode 100644 index 000000000..3c8ca24f0 --- /dev/null +++ b/libc/misc/getloadavg/Makefile.in @@ -0,0 +1,23 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2008 Erik Andersen <andersen(a)uclibc.org> +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +subdirs += libc/misc/getloadavg + +CSRC-y := getloadavg.c + +MISC_GETLOADAVG_DIR := $(top_srcdir)libc/misc/getloadavg +MISC_GETLOADAVG_OUT := $(top_builddir)libc/misc/getloadavg + +MISC_GETLOADAVG_SRC := $(patsubst %.c,$(MISC_GETLOADAVG_DIR)/%.c,$(CSRC-y)) +MISC_GETLOADAVG_OBJ := $(patsubst %.c,$(MISC_GETLOADAVG_OUT)/%.o,$(CSRC-y)) + +libc-y += $(MISC_GETLOADAVG_OBJ) + +objclean-y += CLEAN_libc/misc/getloadavg + +CLEAN_libc/misc/getloadavg: + $(do_rm) $(addprefix $(MISC_GETLOADAVG_OUT)/*., o os) diff --git a/libc/misc/getloadavg/getloadavg.c b/libc/misc/getloadavg/getloadavg.c new file mode 100644 index 000000000..2aee565c0 --- /dev/null +++ b/libc/misc/getloadavg/getloadavg.c @@ -0,0 +1,39 @@ +/* + * Copyright © 2005-2020 Rich Felker, et al. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Imported from musl C library + */ + +#define _GNU_SOURCE +#include <stdlib.h> +#include <sys/sysinfo.h> + +int getloadavg(double *a, int n) +{ + struct sysinfo si; + if (n <= 0) return n ? -1 : 0; + sysinfo(&si); + if (n > 3) n = 3; + for (int i=0; i<n; i++) + a[i] = 1.0/(1<<SI_LOAD_SHIFT) * si.loads[i]; + return n; +} -- 2.20.1

2 1

[PATCH] libc/misc/getloadavg: Add getloadavg support to uClibc-ng.
by lancethepants 20 May '22

20 May '22

This borrows getloadavg.c from musl. LLVM and Rustlang now use or pull in dependencies requiring getloadavg. --- include/stdlib.h | 2 +- libc/misc/Makefile.in | 1 + libc/misc/getloadavg/Makefile | 13 +++++++++++ libc/misc/getloadavg/Makefile.in | 23 ++++++++++++++++++ libc/misc/getloadavg/getloadavg.c | 39 +++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 libc/misc/getloadavg/Makefile create mode 100644 libc/misc/getloadavg/Makefile.in create mode 100644 libc/misc/getloadavg/getloadavg.c diff --git a/include/stdlib.h b/include/stdlib.h index 6a253cc3f..987fe2223 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -979,7 +979,7 @@ extern int getpt (void); # endif #endif -#if 0 /* def __USE_BSD */ +#ifdef __USE_BSD /* Put the 1 minute, 5 minute and 15 minute load averages into the first NELEM elements of LOADAVG. Return the number written (never more than three, but may be less than NELEM), or -1 if an error occurred. */ diff --git a/libc/misc/Makefile.in b/libc/misc/Makefile.in index e45002e60..53bb6d6c8 100644 --- a/libc/misc/Makefile.in +++ b/libc/misc/Makefile.in @@ -14,6 +14,7 @@ include $(top_srcdir)libc/misc/file/Makefile.in include $(top_srcdir)libc/misc/fnmatch/Makefile.in include $(top_srcdir)libc/misc/ftw/Makefile.in include $(top_srcdir)libc/misc/fts/Makefile.in +include $(top_srcdir)libc/misc/getloadavg/Makefile.in include $(top_srcdir)libc/misc/glob/Makefile.in include $(top_srcdir)libc/misc/internals/Makefile.in include $(top_srcdir)libc/misc/locale/Makefile.in diff --git a/libc/misc/getloadavg/Makefile b/libc/misc/getloadavg/Makefile new file mode 100644 index 000000000..4a8f4a072 --- /dev/null +++ b/libc/misc/getloadavg/Makefile @@ -0,0 +1,13 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen <andersen(a)uclibc.org> +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +top_srcdir=../../../ +top_builddir=../../../ +all: objs +include $(top_builddir)Rules.mak +include Makefile.in +include $(top_srcdir)Makerules diff --git a/libc/misc/getloadavg/Makefile.in b/libc/misc/getloadavg/Makefile.in new file mode 100644 index 000000000..3c8ca24f0 --- /dev/null +++ b/libc/misc/getloadavg/Makefile.in @@ -0,0 +1,23 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2008 Erik Andersen <andersen(a)uclibc.org> +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +subdirs += libc/misc/getloadavg + +CSRC-y := getloadavg.c + +MISC_GETLOADAVG_DIR := $(top_srcdir)libc/misc/getloadavg +MISC_GETLOADAVG_OUT := $(top_builddir)libc/misc/getloadavg + +MISC_GETLOADAVG_SRC := $(patsubst %.c,$(MISC_GETLOADAVG_DIR)/%.c,$(CSRC-y)) +MISC_GETLOADAVG_OBJ := $(patsubst %.c,$(MISC_GETLOADAVG_OUT)/%.o,$(CSRC-y)) + +libc-y += $(MISC_GETLOADAVG_OBJ) + +objclean-y += CLEAN_libc/misc/getloadavg + +CLEAN_libc/misc/getloadavg: + $(do_rm) $(addprefix $(MISC_GETLOADAVG_OUT)/*., o os) diff --git a/libc/misc/getloadavg/getloadavg.c b/libc/misc/getloadavg/getloadavg.c new file mode 100644 index 000000000..2aee565c0 --- /dev/null +++ b/libc/misc/getloadavg/getloadavg.c @@ -0,0 +1,39 @@ +/* + * Copyright © 2005-2020 Rich Felker, et al. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Imported from musl C library + */ + +#define _GNU_SOURCE +#include <stdlib.h> +#include <sys/sysinfo.h> + +int getloadavg(double *a, int n) +{ + struct sysinfo si; + if (n <= 0) return n ? -1 : 0; + sysinfo(&si); + if (n > 3) n = 3; + for (int i=0; i<n; i++) + a[i] = 1.0/(1<<SI_LOAD_SHIFT) * si.loads[i]; + return n; +} -- 2.20.1

1 0

new release 1.0.41
by Waldemar Brodkorb 20 May '22

20 May '22

Hi, I released 1.0.41 today. It contains a fix for https://nvd.nist.gov/vuln/detail/CVE-2022-30295 Thanks hanishkvc for fixing it. best regards Waldemar

1 0

Re: 20220511 Configurable dns query id generation including random - int64_t, conditional compile
by C Hanish Menon 18 May '22

18 May '22

Hi, If no one has any specific issues, with the latest dynamic DNS query id related patch? it may be useful to apply the same and make a new release. As it resolves a security concern, to an extent. Based on my experience with embedded systems over the years, I have tried to ensure that the patch can be configured for use with different kinds of embedded systems, with different constraints. -- Keep ;-) HanishKVC

1 0

[PATCH] define RLIMIT_RTTIME, bump RLIMIT_NLIMITS
by Romain Naour 18 May '22

18 May '22

This macro exists since Linux 2.6.25 [1] and is defined in glibc since 2.14 [2] for sparc and most supported architectures. RLIMIT_RTTIME has been added later for mips [3] and alpha [4]. For example, RLIMIT_RTTIME is needed to build qemu 7.0.0 with Linux user-land emulation support [5]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… [2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=67f86a251e0d36107fe2… [3] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=8969f4df1a526aa60dd0… [4] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=53c2cb7641bd86639815… [5] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=244fd08323088db73590ff2317d… Signed-off-by: Romain Naour <romain.naour(a)gmail.com> --- libc/sysdeps/linux/alpha/bits/resource.h | 8 +++++++- libc/sysdeps/linux/common/bits/resource.h | 8 +++++++- libc/sysdeps/linux/mips/bits/resource.h | 8 +++++++- libc/sysdeps/linux/sparc/bits/resource.h | 8 +++++++- libc/sysdeps/linux/sparc64/bits/resource.h | 8 +++++++- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/libc/sysdeps/linux/alpha/bits/resource.h b/libc/sysdeps/linux/alpha/bits/resource.h index 74f4eed69..78b790d86 100644 --- a/libc/sysdeps/linux/alpha/bits/resource.h +++ b/libc/sysdeps/linux/alpha/bits/resource.h @@ -99,7 +99,13 @@ enum __rlimit_resource __RLIMIT_RTPRIO = 14, #define RLIMIT_RTPRIO __RLIMIT_RTPRIO - __RLIMIT_NLIMITS = 15, + /* Maximum CPU time in µs that a process scheduled under a real-time + scheduling policy may consume without making a blocking system + call before being forcibly descheduled. */ + __RLIMIT_RTTIME = 15, +#define RLIMIT_RTTIME __RLIMIT_RTTIME + + __RLIMIT_NLIMITS = 16, __RLIM_NLIMITS = __RLIMIT_NLIMITS #define RLIMIT_NLIMITS __RLIMIT_NLIMITS #define RLIM_NLIMITS __RLIM_NLIMITS diff --git a/libc/sysdeps/linux/common/bits/resource.h b/libc/sysdeps/linux/common/bits/resource.h index df0ba56d9..92b67eb23 100644 --- a/libc/sysdeps/linux/common/bits/resource.h +++ b/libc/sysdeps/linux/common/bits/resource.h @@ -99,7 +99,13 @@ enum __rlimit_resource __RLIMIT_RTPRIO = 14, #define RLIMIT_RTPRIO __RLIMIT_RTPRIO - __RLIMIT_NLIMITS = 15, + /* Maximum CPU time in µs that a process scheduled under a real-time + scheduling policy may consume without making a blocking system + call before being forcibly descheduled. */ + __RLIMIT_RTTIME = 15, +#define RLIMIT_RTTIME __RLIMIT_RTTIME + + __RLIMIT_NLIMITS = 16, __RLIM_NLIMITS = __RLIMIT_NLIMITS #define RLIMIT_NLIMITS __RLIMIT_NLIMITS #define RLIM_NLIMITS __RLIM_NLIMITS diff --git a/libc/sysdeps/linux/mips/bits/resource.h b/libc/sysdeps/linux/mips/bits/resource.h index b204aefd6..48a97f62e 100644 --- a/libc/sysdeps/linux/mips/bits/resource.h +++ b/libc/sysdeps/linux/mips/bits/resource.h @@ -99,7 +99,13 @@ enum __rlimit_resource __RLIMIT_RTPRIO = 14, #define RLIMIT_RTPRIO __RLIMIT_RTPRIO - __RLIMIT_NLIMITS = 15, + /* Maximum CPU time in µs that a process scheduled under a real-time + scheduling policy may consume without making a blocking system + call before being forcibly descheduled. */ + __RLIMIT_RTTIME = 15, +#define RLIMIT_RTTIME __RLIMIT_RTTIME + + __RLIMIT_NLIMITS = 16, __RLIM_NLIMITS = __RLIMIT_NLIMITS #define RLIMIT_NLIMITS __RLIMIT_NLIMITS #define RLIM_NLIMITS __RLIM_NLIMITS diff --git a/libc/sysdeps/linux/sparc/bits/resource.h b/libc/sysdeps/linux/sparc/bits/resource.h index 1005aeced..9bff26d00 100644 --- a/libc/sysdeps/linux/sparc/bits/resource.h +++ b/libc/sysdeps/linux/sparc/bits/resource.h @@ -98,7 +98,13 @@ enum __rlimit_resource __RLIMIT_RTPRIO = 14, #define RLIMIT_RTPRIO __RLIMIT_RTPRIO - __RLIMIT_NLIMITS = 15, + /* Maximum CPU time in µs that a process scheduled under a real-time + scheduling policy may consume without making a blocking system + call before being forcibly descheduled. */ + __RLIMIT_RTTIME = 15, +#define RLIMIT_RTTIME __RLIMIT_RTTIME + + __RLIMIT_NLIMITS = 16, __RLIM_NLIMITS = __RLIMIT_NLIMITS #define RLIMIT_NLIMITS __RLIMIT_NLIMITS #define RLIM_NLIMITS __RLIM_NLIMITS diff --git a/libc/sysdeps/linux/sparc64/bits/resource.h b/libc/sysdeps/linux/sparc64/bits/resource.h index 366e5c2d9..255fb9734 100644 --- a/libc/sysdeps/linux/sparc64/bits/resource.h +++ b/libc/sysdeps/linux/sparc64/bits/resource.h @@ -98,7 +98,13 @@ enum __rlimit_resource __RLIMIT_RTPRIO = 14, #define RLIMIT_RTPRIO __RLIMIT_RTPRIO - __RLIMIT_NLIMITS = 15, + /* Maximum CPU time in µs that a process scheduled under a real-time + scheduling policy may consume without making a blocking system + call before being forcibly descheduled. */ + __RLIMIT_RTTIME = 15, +#define RLIMIT_RTTIME __RLIMIT_RTTIME + + __RLIMIT_NLIMITS = 16, __RLIM_NLIMITS = __RLIMIT_NLIMITS #define RLIMIT_NLIMITS __RLIMIT_NLIMITS #define RLIM_NLIMITS __RLIM_NLIMITS -- 2.35.3

1 0

20220511 Configurable dns query id generation including random - int64_t, conditional compile
by C Hanish Menon 10 May '22

10 May '22

Hi, This is a consolidated patch (named 20220511-FullPatch-....), with these additional features a) Had forgotten about 32bit targets in my last patch, as long could be 32bit in them. So have updated the prngplus logic to explicitly specify int64_t wrt one way transform. Also have increased the prng run length between reseeding in this case. b) At the same time if the target / compiler doesnt support int64_t, then added the option wrt prngplus to fallback to a simple xor based transform, but with a reduced prng run between reseeding. c) Also have added conditional compile wrt the different random or otherwise dns query id generation helpers, So that only the selected strategy will be included in the build. -- Keep ;-) HanishKVC

1 0

Re: Configurable dns query id generation including random
by C Hanish Menon 08 May '22

08 May '22

Hi, This is a consolidated patch containing an updated version of the logic, which adds a one way transform to avoid exposing the internal random sequence wrt the default PrngPlus mode. The transform used should logically not impact randomness in general, and the same has been verified to an extent by checking with TestU01 and DieHarder based rng test logics. With this, functionally the logic is ready. Please do cross check, and integrate if no issues are found. -- Keep ;-) HanishKVC

1 0

Re: Configurable dns query id generation including random
by C Hanish Menon 07 May '22

07 May '22

Hi, A little bit of cleanup wrt the logic and messages/notes. Also have tightened the reseed window wrt prng to be within its internal state size. This is a consolidated patch. -- Keep ;-) HanishKVC

1 0

[uclibc-ng] Unpatched DNS bug affects millions of routers and IoT devices
by Turritopsis Dohrnii Teo En Ming 06 May '22

06 May '22

Subject: [uclibc-ng] Unpatched DNS bug affects millions of routers and IoT devices Good day from Singapore, I have just come across this article. I saw uclibc-ng being mentioned, so I thought of sharing this article. Article: Unpatched DNS bug affects millions of routers and IoT devices Link: https://www.bleepingcomputer.com/news/security/unpatched-dns-bug-affects-mi… [QUOTE] The library uClibc and its fork from the OpenWRT team, uClibc-ng. Both variants are widely used by major vendors like Netgear, Axis, and Linksys, as well as Linux distributions suitable for embedded applications. [/QUOTE] Does it affect my TP-link AC1200 wireless router? Regards, Mr. Turritopsis Dohrnii Teo En Ming Targeted Individual in Singapore 5 May 2022 Thursday

2 1

Configurable dns query id generation including random
by C Hanish Menon 06 May '22

06 May '22

Hi All, This is the updated and consolidated patch with the following additional features a) Add options to the Config.in to allow the platform developer to select between the different supported query id generation logics using make config/menuconfig/... Inturn now one can select between the following modes SimpleCounter / Urandom Only / Clock Only / PrngPlus (with automatic URandom & or Clock based reseeding) . So based on the features available on a given target, and or needs of a specific platform or release, uclibc's dns query id generation can be suitably selected/adjusted. b) The PrngPlus mode maintains its own state wrt prng, so that users of the global random prng won't be affected by dns lookups' use of random. c) Have hopefully tried to follow the coding style better this time. However as I have done lot of changes to the code flow from earlier patchs, I need to cross check once again the same. Please do cross-check the patch once for any possible oversights and or issues. Do note that I have tried this only on a linux vm+container setup, by hand holding the native host build tools and inturn using the prints and tcpdump to verify things are working as required. If no other issues are found, I will remove some of the debug prints I have still retained (and or convert to DPRINTF) and make a release tomorrow. -- Keep ;-) HanishKVC

1 0