]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fcntl: Don't set si_code to SI_SIGIO when sig == SIGPOLL
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 19 Sep 2017 03:51:14 +0000 (22:51 -0500)
committerEric W. Biederman <ebiederm@xmission.com>
Tue, 19 Sep 2017 03:51:14 +0000 (22:51 -0500)
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>
fs/fcntl.c

index 0491da3b28c36bbf786f1f1303d3bb44f6bfdb98..448a1119f0becff3d871a98d8e6cee9b673b2652 100644 (file)
@@ -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_*