From: Greg Kroah-Hartman Date: Thu, 16 Sep 2021 08:45:54 +0000 (+0200) Subject: drop arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch from everywhere. X-Git-Tag: v5.14.5~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bdebb9232fe4ff3c108063fac06b5ec3c1aaefb;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch from everywhere. --- diff --git a/queue-4.14/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch b/queue-4.14/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch deleted file mode 100644 index e17f4855422..00000000000 --- a/queue-4.14/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b6e47f3c11c17965acb2a12001af3b1cd5658f37 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Wed, 11 Aug 2021 08:30:20 +0100 -Subject: ARM: 9109/1: oabi-compat: add epoll_pwait handler - -From: Arnd Bergmann - -commit b6e47f3c11c17965acb2a12001af3b1cd5658f37 upstream. - -The epoll_wait() syscall has a special version for OABI compat -mode to convert the arguments to the EABI structure layout -of the kernel. However, the later epoll_pwait() syscall was -added in arch/arm in linux-2.6.32 without this conversion. - -Use the same kind of handler for both. - -Fixes: 369842658a36 ("ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") -Cc: stable@vger.kernel.org -Reviewed-by: Christoph Hellwig -Signed-off-by: Arnd Bergmann -Signed-off-by: Russell King (Oracle) -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/kernel/sys_oabi-compat.c | 38 +++++++++++++++++++++++++++++++++++--- - arch/arm/tools/syscall.tbl | 2 +- - 2 files changed, 36 insertions(+), 4 deletions(-) - ---- a/arch/arm/kernel/sys_oabi-compat.c -+++ b/arch/arm/kernel/sys_oabi-compat.c -@@ -272,9 +272,8 @@ asmlinkage long sys_oabi_epoll_ctl(int e - return ret; - } - --asmlinkage long sys_oabi_epoll_wait(int epfd, -- struct oabi_epoll_event __user *events, -- int maxevents, int timeout) -+static long do_oabi_epoll_wait(int epfd, struct oabi_epoll_event __user *events, -+ int maxevents, int timeout) - { - struct epoll_event *kbuf; - struct oabi_epoll_event e; -@@ -307,6 +306,39 @@ asmlinkage long sys_oabi_epoll_wait(int - return err ? -EFAULT : ret; - } - -+SYSCALL_DEFINE4(oabi_epoll_wait, int, epfd, -+ struct oabi_epoll_event __user *, events, -+ int, maxevents, int, timeout) -+{ -+ return do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+} -+ -+/* -+ * Implement the event wait interface for the eventpoll file. It is the kernel -+ * part of the user space epoll_pwait(2). -+ */ -+SYSCALL_DEFINE6(oabi_epoll_pwait, int, epfd, -+ struct oabi_epoll_event __user *, events, int, maxevents, -+ int, timeout, const sigset_t __user *, sigmask, -+ size_t, sigsetsize) -+{ -+ int error; -+ -+ /* -+ * If the caller wants a certain signal mask to be set during the wait, -+ * we apply it here. -+ */ -+ error = set_user_sigmask(sigmask, sigsetsize); -+ if (error) -+ return error; -+ -+ error = do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+ restore_saved_sigmask_unless(error == -EINTR); -+ -+ return error; -+} -+#endif -+ - struct oabi_sembuf { - unsigned short sem_num; - short sem_op; ---- a/arch/arm/tools/syscall.tbl -+++ b/arch/arm/tools/syscall.tbl -@@ -360,7 +360,7 @@ - 343 common vmsplice sys_vmsplice - 344 common move_pages sys_move_pages - 345 common getcpu sys_getcpu --346 common epoll_pwait sys_epoll_pwait -+346 common epoll_pwait sys_epoll_pwait sys_oabi_epoll_pwait - 347 common kexec_load sys_kexec_load - 348 common utimensat sys_utimensat - 349 common signalfd sys_signalfd diff --git a/queue-4.14/series b/queue-4.14/series index 325d3e51167..ec24d329be6 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -115,7 +115,6 @@ media-uvc-don-t-do-dma-on-stack.patch media-rc-loopback-return-number-of-emitters-rather-than-error.patch libata-add-ata_horkage_no_ncq_trim-for-samsung-860-and-870-ssds.patch arm-9105-1-atags_to_fdt-don-t-warn-about-stack-size.patch -arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch pci-restrict-asmedia-asm1062-sata-max-payload-size-supported.patch pci-return-0-data-on-pciconfig_read-cap_sys_admin-failure.patch pci-xilinx-nwl-enable-the-clock-through-ccf.patch diff --git a/queue-4.19/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch b/queue-4.19/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch deleted file mode 100644 index e17f4855422..00000000000 --- a/queue-4.19/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b6e47f3c11c17965acb2a12001af3b1cd5658f37 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Wed, 11 Aug 2021 08:30:20 +0100 -Subject: ARM: 9109/1: oabi-compat: add epoll_pwait handler - -From: Arnd Bergmann - -commit b6e47f3c11c17965acb2a12001af3b1cd5658f37 upstream. - -The epoll_wait() syscall has a special version for OABI compat -mode to convert the arguments to the EABI structure layout -of the kernel. However, the later epoll_pwait() syscall was -added in arch/arm in linux-2.6.32 without this conversion. - -Use the same kind of handler for both. - -Fixes: 369842658a36 ("ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") -Cc: stable@vger.kernel.org -Reviewed-by: Christoph Hellwig -Signed-off-by: Arnd Bergmann -Signed-off-by: Russell King (Oracle) -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/kernel/sys_oabi-compat.c | 38 +++++++++++++++++++++++++++++++++++--- - arch/arm/tools/syscall.tbl | 2 +- - 2 files changed, 36 insertions(+), 4 deletions(-) - ---- a/arch/arm/kernel/sys_oabi-compat.c -+++ b/arch/arm/kernel/sys_oabi-compat.c -@@ -272,9 +272,8 @@ asmlinkage long sys_oabi_epoll_ctl(int e - return ret; - } - --asmlinkage long sys_oabi_epoll_wait(int epfd, -- struct oabi_epoll_event __user *events, -- int maxevents, int timeout) -+static long do_oabi_epoll_wait(int epfd, struct oabi_epoll_event __user *events, -+ int maxevents, int timeout) - { - struct epoll_event *kbuf; - struct oabi_epoll_event e; -@@ -307,6 +306,39 @@ asmlinkage long sys_oabi_epoll_wait(int - return err ? -EFAULT : ret; - } - -+SYSCALL_DEFINE4(oabi_epoll_wait, int, epfd, -+ struct oabi_epoll_event __user *, events, -+ int, maxevents, int, timeout) -+{ -+ return do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+} -+ -+/* -+ * Implement the event wait interface for the eventpoll file. It is the kernel -+ * part of the user space epoll_pwait(2). -+ */ -+SYSCALL_DEFINE6(oabi_epoll_pwait, int, epfd, -+ struct oabi_epoll_event __user *, events, int, maxevents, -+ int, timeout, const sigset_t __user *, sigmask, -+ size_t, sigsetsize) -+{ -+ int error; -+ -+ /* -+ * If the caller wants a certain signal mask to be set during the wait, -+ * we apply it here. -+ */ -+ error = set_user_sigmask(sigmask, sigsetsize); -+ if (error) -+ return error; -+ -+ error = do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+ restore_saved_sigmask_unless(error == -EINTR); -+ -+ return error; -+} -+#endif -+ - struct oabi_sembuf { - unsigned short sem_num; - short sem_op; ---- a/arch/arm/tools/syscall.tbl -+++ b/arch/arm/tools/syscall.tbl -@@ -360,7 +360,7 @@ - 343 common vmsplice sys_vmsplice - 344 common move_pages sys_move_pages - 345 common getcpu sys_getcpu --346 common epoll_pwait sys_epoll_pwait -+346 common epoll_pwait sys_epoll_pwait sys_oabi_epoll_pwait - 347 common kexec_load sys_kexec_load - 348 common utimensat sys_utimensat - 349 common signalfd sys_signalfd diff --git a/queue-4.19/series b/queue-4.19/series index 0d83f346c76..540bfcafaf6 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -151,7 +151,6 @@ media-uvc-don-t-do-dma-on-stack.patch media-rc-loopback-return-number-of-emitters-rather-than-error.patch libata-add-ata_horkage_no_ncq_trim-for-samsung-860-and-870-ssds.patch arm-9105-1-atags_to_fdt-don-t-warn-about-stack-size.patch -arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch pci-restrict-asmedia-asm1062-sata-max-payload-size-supported.patch pci-return-0-data-on-pciconfig_read-cap_sys_admin-failure.patch pci-xilinx-nwl-enable-the-clock-through-ccf.patch diff --git a/queue-5.10/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch b/queue-5.10/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch deleted file mode 100644 index 88fd8350105..00000000000 --- a/queue-5.10/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b6e47f3c11c17965acb2a12001af3b1cd5658f37 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Wed, 11 Aug 2021 08:30:20 +0100 -Subject: ARM: 9109/1: oabi-compat: add epoll_pwait handler - -From: Arnd Bergmann - -commit b6e47f3c11c17965acb2a12001af3b1cd5658f37 upstream. - -The epoll_wait() syscall has a special version for OABI compat -mode to convert the arguments to the EABI structure layout -of the kernel. However, the later epoll_pwait() syscall was -added in arch/arm in linux-2.6.32 without this conversion. - -Use the same kind of handler for both. - -Fixes: 369842658a36 ("ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") -Cc: stable@vger.kernel.org -Reviewed-by: Christoph Hellwig -Signed-off-by: Arnd Bergmann -Signed-off-by: Russell King (Oracle) -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/kernel/sys_oabi-compat.c | 38 +++++++++++++++++++++++++++++++++++--- - arch/arm/tools/syscall.tbl | 2 +- - 2 files changed, 36 insertions(+), 4 deletions(-) - ---- a/arch/arm/kernel/sys_oabi-compat.c -+++ b/arch/arm/kernel/sys_oabi-compat.c -@@ -265,9 +265,8 @@ asmlinkage long sys_oabi_epoll_ctl(int e - return do_epoll_ctl(epfd, op, fd, &kernel, false); - } - --asmlinkage long sys_oabi_epoll_wait(int epfd, -- struct oabi_epoll_event __user *events, -- int maxevents, int timeout) -+static long do_oabi_epoll_wait(int epfd, struct oabi_epoll_event __user *events, -+ int maxevents, int timeout) - { - struct epoll_event *kbuf; - struct oabi_epoll_event e; -@@ -314,6 +313,39 @@ asmlinkage long sys_oabi_epoll_wait(int - } - #endif - -+SYSCALL_DEFINE4(oabi_epoll_wait, int, epfd, -+ struct oabi_epoll_event __user *, events, -+ int, maxevents, int, timeout) -+{ -+ return do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+} -+ -+/* -+ * Implement the event wait interface for the eventpoll file. It is the kernel -+ * part of the user space epoll_pwait(2). -+ */ -+SYSCALL_DEFINE6(oabi_epoll_pwait, int, epfd, -+ struct oabi_epoll_event __user *, events, int, maxevents, -+ int, timeout, const sigset_t __user *, sigmask, -+ size_t, sigsetsize) -+{ -+ int error; -+ -+ /* -+ * If the caller wants a certain signal mask to be set during the wait, -+ * we apply it here. -+ */ -+ error = set_user_sigmask(sigmask, sigsetsize); -+ if (error) -+ return error; -+ -+ error = do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+ restore_saved_sigmask_unless(error == -EINTR); -+ -+ return error; -+} -+#endif -+ - struct oabi_sembuf { - unsigned short sem_num; - short sem_op; ---- a/arch/arm/tools/syscall.tbl -+++ b/arch/arm/tools/syscall.tbl -@@ -360,7 +360,7 @@ - 343 common vmsplice sys_vmsplice - 344 common move_pages sys_move_pages - 345 common getcpu sys_getcpu --346 common epoll_pwait sys_epoll_pwait -+346 common epoll_pwait sys_epoll_pwait sys_oabi_epoll_pwait - 347 common kexec_load sys_kexec_load - 348 common utimensat sys_utimensat_time32 - 349 common signalfd sys_signalfd diff --git a/queue-5.10/series b/queue-5.10/series index d755193c467..2f7cb121a45 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -42,7 +42,6 @@ revert-dmaengine-imx-sdma-refine-to-load-context-only-once.patch dmaengine-imx-sdma-remove-duplicated-sdma_load_context.patch libata-add-ata_horkage_no_ncq_trim-for-samsung-860-and-870-ssds.patch arm-9105-1-atags_to_fdt-don-t-warn-about-stack-size.patch -arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch f2fs-fix-to-do-sanity-check-for-sb-cp-fields-correctly.patch pci-portdrv-enable-bandwidth-notification-only-if-port-supports-it.patch pci-restrict-asmedia-asm1062-sata-max-payload-size-supported.patch diff --git a/queue-5.13/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch b/queue-5.13/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch deleted file mode 100644 index 88fd8350105..00000000000 --- a/queue-5.13/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b6e47f3c11c17965acb2a12001af3b1cd5658f37 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Wed, 11 Aug 2021 08:30:20 +0100 -Subject: ARM: 9109/1: oabi-compat: add epoll_pwait handler - -From: Arnd Bergmann - -commit b6e47f3c11c17965acb2a12001af3b1cd5658f37 upstream. - -The epoll_wait() syscall has a special version for OABI compat -mode to convert the arguments to the EABI structure layout -of the kernel. However, the later epoll_pwait() syscall was -added in arch/arm in linux-2.6.32 without this conversion. - -Use the same kind of handler for both. - -Fixes: 369842658a36 ("ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") -Cc: stable@vger.kernel.org -Reviewed-by: Christoph Hellwig -Signed-off-by: Arnd Bergmann -Signed-off-by: Russell King (Oracle) -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/kernel/sys_oabi-compat.c | 38 +++++++++++++++++++++++++++++++++++--- - arch/arm/tools/syscall.tbl | 2 +- - 2 files changed, 36 insertions(+), 4 deletions(-) - ---- a/arch/arm/kernel/sys_oabi-compat.c -+++ b/arch/arm/kernel/sys_oabi-compat.c -@@ -265,9 +265,8 @@ asmlinkage long sys_oabi_epoll_ctl(int e - return do_epoll_ctl(epfd, op, fd, &kernel, false); - } - --asmlinkage long sys_oabi_epoll_wait(int epfd, -- struct oabi_epoll_event __user *events, -- int maxevents, int timeout) -+static long do_oabi_epoll_wait(int epfd, struct oabi_epoll_event __user *events, -+ int maxevents, int timeout) - { - struct epoll_event *kbuf; - struct oabi_epoll_event e; -@@ -314,6 +313,39 @@ asmlinkage long sys_oabi_epoll_wait(int - } - #endif - -+SYSCALL_DEFINE4(oabi_epoll_wait, int, epfd, -+ struct oabi_epoll_event __user *, events, -+ int, maxevents, int, timeout) -+{ -+ return do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+} -+ -+/* -+ * Implement the event wait interface for the eventpoll file. It is the kernel -+ * part of the user space epoll_pwait(2). -+ */ -+SYSCALL_DEFINE6(oabi_epoll_pwait, int, epfd, -+ struct oabi_epoll_event __user *, events, int, maxevents, -+ int, timeout, const sigset_t __user *, sigmask, -+ size_t, sigsetsize) -+{ -+ int error; -+ -+ /* -+ * If the caller wants a certain signal mask to be set during the wait, -+ * we apply it here. -+ */ -+ error = set_user_sigmask(sigmask, sigsetsize); -+ if (error) -+ return error; -+ -+ error = do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+ restore_saved_sigmask_unless(error == -EINTR); -+ -+ return error; -+} -+#endif -+ - struct oabi_sembuf { - unsigned short sem_num; - short sem_op; ---- a/arch/arm/tools/syscall.tbl -+++ b/arch/arm/tools/syscall.tbl -@@ -360,7 +360,7 @@ - 343 common vmsplice sys_vmsplice - 344 common move_pages sys_move_pages - 345 common getcpu sys_getcpu --346 common epoll_pwait sys_epoll_pwait -+346 common epoll_pwait sys_epoll_pwait sys_oabi_epoll_pwait - 347 common kexec_load sys_kexec_load - 348 common utimensat sys_utimensat_time32 - 349 common signalfd sys_signalfd diff --git a/queue-5.13/series b/queue-5.13/series index c971ded3f04..5982f3f1d0e 100644 --- a/queue-5.13/series +++ b/queue-5.13/series @@ -56,7 +56,6 @@ io-wq-fix-race-between-adding-work-and-activating-a-free-worker.patch io_uring-fail-links-of-cancelled-timeouts.patch libata-add-ata_horkage_no_ncq_trim-for-samsung-860-and-870-ssds.patch arm-9105-1-atags_to_fdt-don-t-warn-about-stack-size.patch -arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch f2fs-fix-to-do-sanity-check-for-sb-cp-fields-correctly.patch pci-portdrv-enable-bandwidth-notification-only-if-port-supports-it.patch pci-restrict-asmedia-asm1062-sata-max-payload-size-supported.patch diff --git a/queue-5.14/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch b/queue-5.14/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch deleted file mode 100644 index 88fd8350105..00000000000 --- a/queue-5.14/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b6e47f3c11c17965acb2a12001af3b1cd5658f37 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Wed, 11 Aug 2021 08:30:20 +0100 -Subject: ARM: 9109/1: oabi-compat: add epoll_pwait handler - -From: Arnd Bergmann - -commit b6e47f3c11c17965acb2a12001af3b1cd5658f37 upstream. - -The epoll_wait() syscall has a special version for OABI compat -mode to convert the arguments to the EABI structure layout -of the kernel. However, the later epoll_pwait() syscall was -added in arch/arm in linux-2.6.32 without this conversion. - -Use the same kind of handler for both. - -Fixes: 369842658a36 ("ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") -Cc: stable@vger.kernel.org -Reviewed-by: Christoph Hellwig -Signed-off-by: Arnd Bergmann -Signed-off-by: Russell King (Oracle) -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/kernel/sys_oabi-compat.c | 38 +++++++++++++++++++++++++++++++++++--- - arch/arm/tools/syscall.tbl | 2 +- - 2 files changed, 36 insertions(+), 4 deletions(-) - ---- a/arch/arm/kernel/sys_oabi-compat.c -+++ b/arch/arm/kernel/sys_oabi-compat.c -@@ -265,9 +265,8 @@ asmlinkage long sys_oabi_epoll_ctl(int e - return do_epoll_ctl(epfd, op, fd, &kernel, false); - } - --asmlinkage long sys_oabi_epoll_wait(int epfd, -- struct oabi_epoll_event __user *events, -- int maxevents, int timeout) -+static long do_oabi_epoll_wait(int epfd, struct oabi_epoll_event __user *events, -+ int maxevents, int timeout) - { - struct epoll_event *kbuf; - struct oabi_epoll_event e; -@@ -314,6 +313,39 @@ asmlinkage long sys_oabi_epoll_wait(int - } - #endif - -+SYSCALL_DEFINE4(oabi_epoll_wait, int, epfd, -+ struct oabi_epoll_event __user *, events, -+ int, maxevents, int, timeout) -+{ -+ return do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+} -+ -+/* -+ * Implement the event wait interface for the eventpoll file. It is the kernel -+ * part of the user space epoll_pwait(2). -+ */ -+SYSCALL_DEFINE6(oabi_epoll_pwait, int, epfd, -+ struct oabi_epoll_event __user *, events, int, maxevents, -+ int, timeout, const sigset_t __user *, sigmask, -+ size_t, sigsetsize) -+{ -+ int error; -+ -+ /* -+ * If the caller wants a certain signal mask to be set during the wait, -+ * we apply it here. -+ */ -+ error = set_user_sigmask(sigmask, sigsetsize); -+ if (error) -+ return error; -+ -+ error = do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+ restore_saved_sigmask_unless(error == -EINTR); -+ -+ return error; -+} -+#endif -+ - struct oabi_sembuf { - unsigned short sem_num; - short sem_op; ---- a/arch/arm/tools/syscall.tbl -+++ b/arch/arm/tools/syscall.tbl -@@ -360,7 +360,7 @@ - 343 common vmsplice sys_vmsplice - 344 common move_pages sys_move_pages - 345 common getcpu sys_getcpu --346 common epoll_pwait sys_epoll_pwait -+346 common epoll_pwait sys_epoll_pwait sys_oabi_epoll_pwait - 347 common kexec_load sys_kexec_load - 348 common utimensat sys_utimensat_time32 - 349 common signalfd sys_signalfd diff --git a/queue-5.14/series b/queue-5.14/series index 44fecd715cc..56a56c625bc 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -59,7 +59,6 @@ dmaengine-imx-sdma-remove-duplicated-sdma_load_context.patch watchdog-itco_wdt-fix-detection-of-smi-off-case.patch libata-add-ata_horkage_no_ncq_trim-for-samsung-860-and-870-ssds.patch arm-9105-1-atags_to_fdt-don-t-warn-about-stack-size.patch -arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch sched-prevent-balance_push-on-remote-runqueues.patch f2fs-let-s-keep-writing-ios-on-sbi_need_fsck.patch f2fs-fix-to-do-sanity-check-for-sb-cp-fields-correctly.patch diff --git a/queue-5.4/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch b/queue-5.4/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch deleted file mode 100644 index 964e3f20d4c..00000000000 --- a/queue-5.4/arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b6e47f3c11c17965acb2a12001af3b1cd5658f37 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Wed, 11 Aug 2021 08:30:20 +0100 -Subject: ARM: 9109/1: oabi-compat: add epoll_pwait handler - -From: Arnd Bergmann - -commit b6e47f3c11c17965acb2a12001af3b1cd5658f37 upstream. - -The epoll_wait() syscall has a special version for OABI compat -mode to convert the arguments to the EABI structure layout -of the kernel. However, the later epoll_pwait() syscall was -added in arch/arm in linux-2.6.32 without this conversion. - -Use the same kind of handler for both. - -Fixes: 369842658a36 ("ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") -Cc: stable@vger.kernel.org -Reviewed-by: Christoph Hellwig -Signed-off-by: Arnd Bergmann -Signed-off-by: Russell King (Oracle) -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/kernel/sys_oabi-compat.c | 38 +++++++++++++++++++++++++++++++++++--- - arch/arm/tools/syscall.tbl | 2 +- - 2 files changed, 36 insertions(+), 4 deletions(-) - ---- a/arch/arm/kernel/sys_oabi-compat.c -+++ b/arch/arm/kernel/sys_oabi-compat.c -@@ -269,9 +269,8 @@ asmlinkage long sys_oabi_epoll_ctl(int e - return ret; - } - --asmlinkage long sys_oabi_epoll_wait(int epfd, -- struct oabi_epoll_event __user *events, -- int maxevents, int timeout) -+static long do_oabi_epoll_wait(int epfd, struct oabi_epoll_event __user *events, -+ int maxevents, int timeout) - { - struct epoll_event *kbuf; - struct oabi_epoll_event e; -@@ -304,6 +303,39 @@ asmlinkage long sys_oabi_epoll_wait(int - return err ? -EFAULT : ret; - } - -+SYSCALL_DEFINE4(oabi_epoll_wait, int, epfd, -+ struct oabi_epoll_event __user *, events, -+ int, maxevents, int, timeout) -+{ -+ return do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+} -+ -+/* -+ * Implement the event wait interface for the eventpoll file. It is the kernel -+ * part of the user space epoll_pwait(2). -+ */ -+SYSCALL_DEFINE6(oabi_epoll_pwait, int, epfd, -+ struct oabi_epoll_event __user *, events, int, maxevents, -+ int, timeout, const sigset_t __user *, sigmask, -+ size_t, sigsetsize) -+{ -+ int error; -+ -+ /* -+ * If the caller wants a certain signal mask to be set during the wait, -+ * we apply it here. -+ */ -+ error = set_user_sigmask(sigmask, sigsetsize); -+ if (error) -+ return error; -+ -+ error = do_oabi_epoll_wait(epfd, events, maxevents, timeout); -+ restore_saved_sigmask_unless(error == -EINTR); -+ -+ return error; -+} -+#endif -+ - struct oabi_sembuf { - unsigned short sem_num; - short sem_op; ---- a/arch/arm/tools/syscall.tbl -+++ b/arch/arm/tools/syscall.tbl -@@ -360,7 +360,7 @@ - 343 common vmsplice sys_vmsplice - 344 common move_pages sys_move_pages - 345 common getcpu sys_getcpu --346 common epoll_pwait sys_epoll_pwait -+346 common epoll_pwait sys_epoll_pwait sys_oabi_epoll_pwait - 347 common kexec_load sys_kexec_load - 348 common utimensat sys_utimensat_time32 - 349 common signalfd sys_signalfd diff --git a/queue-5.4/series b/queue-5.4/series index d997e43c0af..a115a9fa3f9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -27,7 +27,6 @@ revert-dmaengine-imx-sdma-refine-to-load-context-only-once.patch dmaengine-imx-sdma-remove-duplicated-sdma_load_context.patch libata-add-ata_horkage_no_ncq_trim-for-samsung-860-and-870-ssds.patch arm-9105-1-atags_to_fdt-don-t-warn-about-stack-size.patch -arm-9109-1-oabi-compat-add-epoll_pwait-handler.patch pci-portdrv-enable-bandwidth-notification-only-if-port-supports-it.patch pci-restrict-asmedia-asm1062-sata-max-payload-size-supported.patch pci-return-0-data-on-pciconfig_read-cap_sys_admin-failure.patch