Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 May 2015 17:59:18 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r283483 - head/sys/compat/linux
Message-ID:  <201505241759.t4OHxIqQ036300@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dchagin
Date: Sun May 24 17:59:17 2015
New Revision: 283483
URL: https://svnweb.freebsd.org/changeset/base/283483

Log:
  Convert signal number to native for VT_SETMODE ioctl and remove
  strange and invalid ISSIGVALID macro.
  The code has not been tested right way but it was originally broken.

Modified:
  head/sys/compat/linux/linux_ioctl.c

Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c	Sun May 24 17:58:24 2015	(r283482)
+++ head/sys/compat/linux/linux_ioctl.c	Sun May 24 17:59:17 2015	(r283483)
@@ -1977,8 +1977,6 @@ linux_ioctl_sound(struct thread *td, str
  * Console related ioctls
  */
 
-#define ISSIGVALID(sig)		((sig) > 0 && (sig) < NSIG)
-
 static int
 linux_ioctl_console(struct thread *td, struct linux_ioctl_args *args)
 {
@@ -2061,8 +2059,16 @@ linux_ioctl_console(struct thread *td, s
 		struct vt_mode mode;
 		if ((error = copyin((void *)args->arg, &mode, sizeof(mode))))
 			break;
-		if (!ISSIGVALID(mode.frsig) && ISSIGVALID(mode.acqsig))
-			mode.frsig = mode.acqsig;
+		if (LINUX_SIG_VALID(mode.relsig))
+			mode.relsig = linux_to_bsd_signal(mode.relsig);
+		else
+			mode.relsig = 0;
+		if (LINUX_SIG_VALID(mode.acqsig))
+			mode.acqsig = linux_to_bsd_signal(mode.acqsig);
+		else
+			mode.acqsig = 0;
+		/* XXX. Linux ignores frsig and set it to 0. */
+		mode.frsig = 0;
 		if ((error = copyout(&mode, (void *)args->arg, sizeof(mode))))
 			break;
 		args->cmd = VT_SETMODE;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505241759.t4OHxIqQ036300>