Fix epoll_create regression (#2155825)

This commit is contained in:
Florian Weimer 2022-12-22 17:23:51 +01:00
parent 4024998b40
commit c3dda3d423
2 changed files with 26 additions and 1 deletions

21
glibc-rh2155825.patch Normal file
View File

@ -0,0 +1,21 @@
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Dec 22 15:42:20 2022 +0100
Linux: Pass size argument of epoll_create to the kernel
The kernel actually verifies it, and a garbage value in the register
causes improper system call failures.
diff --git a/sysdeps/unix/sysv/linux/epoll_create.c b/sysdeps/unix/sysv/linux/epoll_create.c
index afb1921637c25013..cb6a67e602494018 100644
--- a/sysdeps/unix/sysv/linux/epoll_create.c
+++ b/sysdeps/unix/sysv/linux/epoll_create.c
@@ -25,7 +25,7 @@ int
epoll_create (int size)
{
#ifdef __NR_epoll_create
- return INLINE_SYSCALL_CALL (epoll_create);
+ return INLINE_SYSCALL_CALL (epoll_create, size);
#else
if (size <= 0)
{

View File

@ -159,7 +159,7 @@ Version: %{glibcversion}
# - It allows using the Release number without the %%dist tag in the dependency # - It allows using the Release number without the %%dist tag in the dependency
# generator to make the generated requires interchangeable between Rawhide # generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX). # and ELN (.elnYY < .fcXX).
%global baserelease 18 %global baserelease 19
Release: %{baserelease}%{?dist} Release: %{baserelease}%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for # In general, GPLv2+ is used by programs, LGPLv2+ is used for
@ -230,6 +230,7 @@ Patch9: glibc-rh827510.patch
Patch13: glibc-fedora-localedata-rh61908.patch Patch13: glibc-fedora-localedata-rh61908.patch
Patch17: glibc-cs-path.patch Patch17: glibc-cs-path.patch
Patch23: glibc-python3.patch Patch23: glibc-python3.patch
Patch24: glibc-rh2155825.patch
############################################################################## ##############################################################################
# Continued list of core "glibc" package information: # Continued list of core "glibc" package information:
@ -2193,6 +2194,9 @@ update_gconv_modules_cache ()
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Thu Dec 22 2022 Florian Weimer <fweimer@redhat.com> - 2.36.9000-19
- Fix epoll_create regression (#2155825)
* Mon Dec 19 2022 Florian Weimer <fweimer@redhat.com> - 2.36.9000-18 * Mon Dec 19 2022 Florian Weimer <fweimer@redhat.com> - 2.36.9000-18
- Auto-sync with upstream branch master, - Auto-sync with upstream branch master,
commit c1c0dea38833751f36a145c322ce53c9a08332e1: commit c1c0dea38833751f36a145c322ce53c9a08332e1: