wok-current view gpm/stuff/gpm.gcc7.diff @ rev 25695
Up linux 5.10.214, Patch xorg-server (CVE-2024-31080, CVE-2024-31081, CVE-2024-31082, CVE-2024-31083)
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Thu Apr 04 08:53:51 2024 +0000 (2 months ago) |
| parents | |
| children |
line source
1 --- ./src/prog/gpm-root.y.orig 2012-10-26 16:21:38.000000000 -0500
2 +++ ./src/prog/gpm-root.y 2018-02-03 14:52:27.229309044 -0600
3 @@ -1196,11 +1196,7 @@
4 LOG_DAEMON : LOG_USER);
5 /* reap your zombies */
6 childaction.sa_handler=reap_children;
7 -#if defined(__GLIBC__)
8 - __sigemptyset(&childaction.sa_mask);
9 -#else /* __GLIBC__ */
10 - childaction.sa_mask=0;
11 -#endif /* __GLIBC__ */
12 + sigemptyset(&childaction.sa_mask);
13 childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
14 sigaction(SIGCHLD,&childaction,NULL);
16 --- ./src/daemon/open_console.c.orig 2018-02-03 14:49:24.586310986 -0600
17 +++ ./src/daemon/open_console.c 2018-02-03 14:53:03.347308660 -0600
18 @@ -24,6 +24,10 @@
19 #include <sys/ioctl.h> /* ioctl */
20 #include <sys/types.h>
22 +#ifdef HAVE_SYS_SYSMACROS_H
23 +#include <sys/sysmacros.h> /* major() w/newer glibc */
24 +#endif
25 +
26 /* Linux specific (to be outsourced in gpm2 */
27 #include <linux/serial.h> /* for serial console check */
28 #include <asm/ioctls.h> /* for serial console check */