]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Jan 2018 08:35:20 +0000 (09:35 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Jan 2018 08:35:20 +0000 (09:35 +0100)
added patches:
eventpoll.h-add-missing-epoll-event-masks.patch

queue-4.4/eventpoll.h-add-missing-epoll-event-masks.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/eventpoll.h-add-missing-epoll-event-masks.patch b/queue-4.4/eventpoll.h-add-missing-epoll-event-masks.patch
new file mode 100644 (file)
index 0000000..0c0d87e
--- /dev/null
@@ -0,0 +1,48 @@
+From 7e040726850a106587485c21bdacc0bfc8a0cbed Mon Sep 17 00:00:00 2001
+From: Greg KH <gregkh@linuxfoundation.org>
+Date: Wed, 8 Mar 2017 19:03:44 +0100
+Subject: eventpoll.h: add missing epoll event masks
+
+From: Greg KH <gregkh@linuxfoundation.org>
+
+commit 7e040726850a106587485c21bdacc0bfc8a0cbed upstream.
+
+[resend due to me forgetting to cc: linux-api the first time around I
+posted these back on Feb 23]
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+For some reason these values are not in the uapi header file, so any
+libc has to define it themselves.  To prevent them from needing to do
+this, just have the kernel provide the correct values.
+
+Reported-by: Elliott Hughes <enh@google.com>
+Signed-off-by: Greg Hackmann <ghackmann@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/linux/eventpoll.h |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/include/uapi/linux/eventpoll.h
++++ b/include/uapi/linux/eventpoll.h
+@@ -26,6 +26,19 @@
+ #define EPOLL_CTL_DEL 2
+ #define EPOLL_CTL_MOD 3
++/* Epoll event masks */
++#define EPOLLIN               0x00000001
++#define EPOLLPRI      0x00000002
++#define EPOLLOUT      0x00000004
++#define EPOLLERR      0x00000008
++#define EPOLLHUP      0x00000010
++#define EPOLLRDNORM   0x00000040
++#define EPOLLRDBAND   0x00000080
++#define EPOLLWRNORM   0x00000100
++#define EPOLLWRBAND   0x00000200
++#define EPOLLMSG      0x00000400
++#define EPOLLRDHUP    0x00002000
++
+ /*
+  * Request the handling of system wakeup events so as to prevent system suspends
+  * from happening while those events are being processed.
index d04ce54e82d667f30982e9707f087d4d89d26ac6..c9e296ccd686cbbbf19bcd523b4992d6ca097d9a 100644 (file)
@@ -52,3 +52,4 @@ usbip-fix-stub_rx-harden-cmd_submit-path-to-handle-malicious-input.patch
 usbip-prevent-leaking-socket-pointer-address-in-messages.patch
 um-link-vmlinux-with-no-pie.patch
 vsyscall-fix-permissions-for-emulate-mode-with-kaiser-pti.patch
+eventpoll.h-add-missing-epoll-event-masks.patch