From add15d1462603b8d74ab939edf3defe3017488cc Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 17 Jul 2018 09:24:05 -0700 Subject: [PATCH] Linux v4.18-rc5-36-g30b06abfb92b --- aio-don-t-expose-__aio_sigset-in-uapi.patch | 79 +++++++++++++++++++++ gitrev | 2 +- kernel.spec | 7 +- sources | 1 + 4 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 aio-don-t-expose-__aio_sigset-in-uapi.patch diff --git a/aio-don-t-expose-__aio_sigset-in-uapi.patch b/aio-don-t-expose-__aio_sigset-in-uapi.patch new file mode 100644 index 000000000..606a7d391 --- /dev/null +++ b/aio-don-t-expose-__aio_sigset-in-uapi.patch @@ -0,0 +1,79 @@ +From patchwork Wed Jul 11 13:48:46 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: aio: don't expose __aio_sigset in uapi +From: Christoph Hellwig +X-Patchwork-Id: 10519793 +Message-Id: <20180711134846.18944-1-hch@lst.de> +To: viro@zeniv.linux.org.uk +Cc: linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, + adrian@lisas.de, smueller@chronox.de, avagin@virtuozzo.com +Date: Wed, 11 Jul 2018 15:48:46 +0200 + +glibc uses a different defintion of sigset_t than the kernel does, +and the current version would pull in both. To fix this just do not +expose the type at all - this somewhat mirrors pselect() where we +do not even have a type for the magic sigmask argument, but just +use pointer arithmetics. + +Fixes: 7a074e96 ("aio: implement io_pgetevents") +Signed-off-by: Christoph Hellwig +Reported-by: Adrian Reber +--- + fs/aio.c | 5 +++++ + include/linux/syscalls.h | 1 + + include/uapi/linux/aio_abi.h | 6 ------ + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/fs/aio.c b/fs/aio.c +index 210df9da1283..27454594e37a 100644 +--- a/fs/aio.c ++++ b/fs/aio.c +@@ -1896,6 +1896,11 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, + return ret; + } + ++struct __aio_sigset { ++ const sigset_t __user *sigmask; ++ size_t sigsetsize; ++}; ++ + SYSCALL_DEFINE6(io_pgetevents, + aio_context_t, ctx_id, + long, min_nr, +diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h +index a368a68cb667..5c1a0933768e 100644 +--- a/include/linux/syscalls.h ++++ b/include/linux/syscalls.h +@@ -11,6 +11,7 @@ + #ifndef _LINUX_SYSCALLS_H + #define _LINUX_SYSCALLS_H + ++struct __aio_sigset; + struct epoll_event; + struct iattr; + struct inode; +diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h +index 3c5038b587ba..d4593a6062ef 100644 +--- a/include/uapi/linux/aio_abi.h ++++ b/include/uapi/linux/aio_abi.h +@@ -29,7 +29,6 @@ + + #include + #include +-#include + #include + + typedef __kernel_ulong_t aio_context_t; +@@ -110,10 +109,5 @@ struct iocb { + #undef IFBIG + #undef IFLITTLE + +-struct __aio_sigset { +- const sigset_t __user *sigmask; +- size_t sigsetsize; +-}; +- + #endif /* __LINUX__AIO_ABI_H */ + diff --git a/gitrev b/gitrev index 79354a800..51be05a08 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -63f04777162181798399a2c4e5436d0d0c16291b +30b06abfb92bfd5f9b63ea6a2ffb0bd905d1a6da diff --git a/kernel.spec b/kernel.spec index e7a56812a..dab6a14ca 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -619,6 +619,8 @@ Patch514: 0005-treewide-Rename-HOSTLDFLAGS-to-KBUILD_HOSTLDFLAGS.patch Patch515: 0006-treewide-Rename-HOST_LOADLIBES-to-KBUILD_HOSTLDLIBS.patch Patch516: 0007-Kbuild-Use-HOST-FLAGS-options-from-the-command-line.patch +# rhbz 1601529 +Patch517: aio-don-t-expose-__aio_sigset-in-uapi.patch # END OF PATCH DEFINITIONS @@ -1873,6 +1875,9 @@ fi # # %changelog +* Tue Jul 17 2018 Laura Abbott - 4.18.0-0.rc5.git1.1 +- Linux v4.18-rc5-36-g30b06abfb92b + * Tue Jul 17 2018 Laura Abbott - Reenable debugging options. diff --git a/sources b/sources index 021a7954d..eaee70e2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db SHA512 (patch-4.18-rc5.xz) = 238685483f0eb95d95678dd4ddd83c044d3888bd4ccc6966c6f9e8209a21aea86c18ba4a8e10c9e0d78037bc4809a93196f44ee23e8f9463641a16ca1ea97574 +SHA512 (patch-4.18-rc5-git1.xz) = 297613110fb87dbb42363fdd961dd8e42214a55ed74bfd7b13c970a3a69ff509ea6cc836845c4bfbb1005c00adcad5adc58f9190d622046309e7007ea57f0846