mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Remove kernel version check
The kernel version check is used to avoid glibc to run on older kernels where some syscall are not available and fallback code are not enabled to handle graciously fail. However, it does not prevent if the kernel does not correctly advertise its version through vDSO note, uname or procfs. Also kernel version checks are sometime not desirable by users, where they want to deploy on different system with different kernel version knowing the minimum set of syscall is always presented on such systems. The kernel version check has been removed along with the LD_ASSUME_KERNEL environment variable. The minimum kernel used to built glibc is still provided through NT_GNU_ABI_TAG ELF note and also printed when libc.so is issued. Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella
5
sysdeps/unix/sysv/linux/configure
vendored
5
sysdeps/unix/sysv/linux/configure
vendored
@ -70,6 +70,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5
|
||||
$as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; }
|
||||
decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
|
||||
abinumstr=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1.\2.\3/'`;
|
||||
abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
@ -96,6 +97,10 @@ $as_echo "$libc_minimum_kernel" >&6; }
|
||||
if test "$libc_minimum_kernel" = ok; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define __LINUX_KERNEL_VERSION $decnum
|
||||
_ACEOF
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define __LINUX_KERNEL_VERSION_STR "$abinumstr"
|
||||
_ACEOF
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
||||
@ -50,6 +50,7 @@ fi
|
||||
AC_MSG_CHECKING(for kernel header at least $minimum_kernel)
|
||||
changequote(,)dnl
|
||||
decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
|
||||
abinumstr=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1.\2.\3/'`;
|
||||
abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;
|
||||
changequote([,])dnl
|
||||
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[#include <linux/version.h>
|
||||
@ -59,6 +60,7 @@ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[#include <linux/version.h>
|
||||
AC_MSG_RESULT($libc_minimum_kernel)
|
||||
if test "$libc_minimum_kernel" = ok; then
|
||||
AC_DEFINE_UNQUOTED(__LINUX_KERNEL_VERSION, $decnum)
|
||||
AC_DEFINE_UNQUOTED(__LINUX_KERNEL_VERSION_STR, "$abinumstr")
|
||||
AC_DEFINE_UNQUOTED(__ABI_TAG_VERSION, $abinum)
|
||||
else
|
||||
AC_MSG_ERROR([*** The available kernel headers are older than the requested
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
/* Optional code to distinguish library flavours.
|
||||
Copyright (C) 2001-2022 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef _DL_LIBRECON_H
|
||||
#define _DL_LIBRECON_H 1
|
||||
|
||||
static inline void __attribute__ ((unused, always_inline))
|
||||
_dl_osversion_init (char *assume_kernel)
|
||||
{
|
||||
unsigned long int i, j, osversion = 0;
|
||||
char *p = assume_kernel, *q;
|
||||
|
||||
for (i = 0; i < 3; i++, p = q + 1)
|
||||
{
|
||||
j = _dl_strtoul (p, &q);
|
||||
if (j >= 255 || p == q || (i < 2 && *q && *q != '.'))
|
||||
{
|
||||
osversion = 0;
|
||||
break;
|
||||
}
|
||||
osversion |= j << (16 - 8 * i);
|
||||
if (!*q)
|
||||
break;
|
||||
}
|
||||
if (osversion)
|
||||
GLRO(dl_osversion) = osversion;
|
||||
}
|
||||
|
||||
/* Recognizing extra environment variables. */
|
||||
#define EXTRA_LD_ENVVARS_13 \
|
||||
if (memcmp (envline, "ASSUME_KERNEL", 13) == 0) \
|
||||
{ \
|
||||
_dl_osversion_init (&envline[14]); \
|
||||
break; \
|
||||
}
|
||||
|
||||
#define DL_OSVERSION_INIT \
|
||||
do { \
|
||||
char *assume_kernel = getenv ("LD_ASSUME_KERNEL"); \
|
||||
if (assume_kernel) \
|
||||
_dl_osversion_init (assume_kernel); \
|
||||
} while (0)
|
||||
|
||||
#endif /* dl-librecon.h */
|
||||
@ -22,31 +22,6 @@
|
||||
#include <stdint.h>
|
||||
#include <not-cancel.h>
|
||||
|
||||
#ifndef MIN
|
||||
# define MIN(a,b) (((a)<(b))?(a):(b))
|
||||
#endif
|
||||
|
||||
#define DL_SYSDEP_OSCHECK(FATAL) \
|
||||
do { \
|
||||
/* Test whether the kernel is new enough. This test is only performed \
|
||||
if the library is not compiled to run on all kernels. */ \
|
||||
\
|
||||
int version = _dl_discover_osversion (); \
|
||||
if (__glibc_likely (version >= 0)) \
|
||||
{ \
|
||||
if (__builtin_expect (GLRO(dl_osversion) == 0, 1) \
|
||||
|| GLRO(dl_osversion) > version) \
|
||||
GLRO(dl_osversion) = version; \
|
||||
\
|
||||
/* Now we can test with the required version. */ \
|
||||
if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION) \
|
||||
/* Not sufficent. */ \
|
||||
FATAL ("FATAL: kernel too old\n"); \
|
||||
} \
|
||||
else if (__LINUX_KERNEL_VERSION > 0) \
|
||||
FATAL ("FATAL: cannot determine kernel version\n"); \
|
||||
} while (0)
|
||||
|
||||
static inline uintptr_t __attribute__ ((always_inline))
|
||||
_dl_setup_stack_chk_guard (void *dl_random)
|
||||
{
|
||||
|
||||
@ -250,96 +250,3 @@ _dl_show_auxv (void)
|
||||
}
|
||||
|
||||
#endif /* SHARED */
|
||||
|
||||
|
||||
int
|
||||
attribute_hidden
|
||||
_dl_discover_osversion (void)
|
||||
{
|
||||
#ifdef SHARED
|
||||
if (GLRO(dl_sysinfo_map) != NULL)
|
||||
{
|
||||
/* If the kernel-supplied DSO contains a note indicating the kernel's
|
||||
version, we don't need to call uname or parse any strings. */
|
||||
|
||||
static const struct
|
||||
{
|
||||
ElfW(Nhdr) hdr;
|
||||
char vendor[8];
|
||||
} expected_note = { { sizeof "Linux", sizeof (ElfW(Word)), 0 }, "Linux" };
|
||||
const ElfW(Phdr) *const phdr = GLRO(dl_sysinfo_map)->l_phdr;
|
||||
const ElfW(Word) phnum = GLRO(dl_sysinfo_map)->l_phnum;
|
||||
for (unsigned int i = 0; i < phnum; ++i)
|
||||
if (phdr[i].p_type == PT_NOTE)
|
||||
{
|
||||
const ElfW(Addr) start = (phdr[i].p_vaddr
|
||||
+ GLRO(dl_sysinfo_map)->l_addr);
|
||||
const ElfW(Nhdr) *note = (const void *) start;
|
||||
while ((ElfW(Addr)) (note + 1) - start < phdr[i].p_memsz)
|
||||
{
|
||||
if (!memcmp (note, &expected_note, sizeof expected_note))
|
||||
return *(const ElfW(Word) *) ((const void *) note
|
||||
+ sizeof expected_note);
|
||||
#define ROUND(len) (((len) + sizeof note->n_type - 1) & -sizeof note->n_type)
|
||||
note = ((const void *) (note + 1)
|
||||
+ ROUND (note->n_namesz) + ROUND (note->n_descsz));
|
||||
#undef ROUND
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* SHARED */
|
||||
|
||||
char bufmem[64];
|
||||
char *buf = bufmem;
|
||||
unsigned int version;
|
||||
int parts;
|
||||
char *cp;
|
||||
struct utsname uts;
|
||||
|
||||
/* Try the uname system call. */
|
||||
if (__uname (&uts))
|
||||
{
|
||||
/* This was not successful. Now try reading the /proc filesystem. */
|
||||
int fd = __open64_nocancel ("/proc/sys/kernel/osrelease", O_RDONLY);
|
||||
if (fd < 0)
|
||||
return -1;
|
||||
ssize_t reslen = __read_nocancel (fd, bufmem, sizeof (bufmem));
|
||||
__close_nocancel (fd);
|
||||
if (reslen <= 0)
|
||||
/* This also didn't work. We give up since we cannot
|
||||
make sure the library can actually work. */
|
||||
return -1;
|
||||
buf[MIN (reslen, (ssize_t) sizeof (bufmem) - 1)] = '\0';
|
||||
}
|
||||
else
|
||||
buf = uts.release;
|
||||
|
||||
/* Now convert it into a number. The string consists of at most
|
||||
three parts. */
|
||||
version = 0;
|
||||
parts = 0;
|
||||
cp = buf;
|
||||
while ((*cp >= '0') && (*cp <= '9'))
|
||||
{
|
||||
unsigned int here = *cp++ - '0';
|
||||
|
||||
while ((*cp >= '0') && (*cp <= '9'))
|
||||
{
|
||||
here *= 10;
|
||||
here += *cp++ - '0';
|
||||
}
|
||||
|
||||
++parts;
|
||||
version <<= 8;
|
||||
version |= here;
|
||||
|
||||
if (*cp++ != '.' || parts == 3)
|
||||
/* Another part following? */
|
||||
break;
|
||||
}
|
||||
|
||||
if (parts < 3)
|
||||
version <<= 8 * (3 - parts);
|
||||
|
||||
return version;
|
||||
}
|
||||
|
||||
@ -24,10 +24,3 @@
|
||||
we aren't making direct use of it. So enable this across the board. */
|
||||
|
||||
#define NEED_DL_SYSINFO_DSO 1
|
||||
|
||||
|
||||
#ifndef __ASSEMBLER__
|
||||
/* Get version of the OS. */
|
||||
extern int _dl_discover_osversion (void) attribute_hidden;
|
||||
# define HAVE_DL_DISCOVER_OSVERSION 1
|
||||
#endif
|
||||
|
||||
@ -18,8 +18,6 @@
|
||||
|
||||
#ifndef _DL_LIBRECON_H
|
||||
|
||||
#include <sysdeps/unix/sysv/linux/dl-librecon.h>
|
||||
|
||||
#define DISTINGUISH_LIB_VERSIONS \
|
||||
do \
|
||||
{ \
|
||||
|
||||
Reference in New Issue
Block a user