From: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue, 19 Sep 2017 03:51:14 +0000 (-0500)
Subject: fcntl: Don't set si_code to SI_SIGIO when sig == SIGPOLL
X-Git-Tag: Ubuntu-5.0.0-8.9~3986^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=54640d238760a1a54dfebe039b49682522100186;p=mirror_ubuntu-disco-kernel.git

fcntl: Don't set si_code to SI_SIGIO when sig == SIGPOLL

When fixing things to avoid ambiguous cases I had a thinko
and included SIGPOLL/SIGIO in with all of the other signals
that have signal specific si_codes.  Which is completely wrong.

Fix that.

Reported-by: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 0491da3b28c3..448a1119f0be 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -749,7 +749,7 @@ static void send_sigio_to_task(struct task_struct *p,
 			 * specific si_codes.  In that case use SI_SIGIO instead
 			 * to remove the ambiguity.
 			 */
-			if (sig_specific_sicodes(signum))
+			if ((signum != SIGPOLL) && sig_specific_sicodes(signum))
 				si.si_code = SI_SIGIO;
 
 			/* Make sure we are called with one of the POLL_*