Commit b8350cd0 authored Sep 19, 2017 by Linus Torvalds

user-namespace

Pull si_code fix from Eric Biederman:
 "When sorting out the si_code ambiguity fcntl I accidentally overshot
  and included SIGPOLL as well. Ooops! This is my trivial fix for that.

  Vince Weaver caught this when it landed in your tree with his
  perf_event_tests many of which started failing because the si_code
  changed"

Quoth Vince Weaver:
 "I've tested with this patch applied and can confirm all of my tests
  now pass again"

Fixes: d08477aa ("fcntl: Don't use ambiguous SIG_POLL si_codes")

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  fcntl: Don't set si_code to SI_SIGIO when sig == SIGPOLL

parents 94686c3c 54640d23

fs/fcntl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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_*

Admin message