diff options
| author | dchagin <dchagin@FreeBSD.org> | 2015-05-24 17:59:17 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2015-05-24 17:59:17 +0000 |
| commit | 0dfca1d9b39e77b0e20f454891d05aaadb4b1eea (patch) | |
| tree | 3b2bd3fde4d647cee273b79453b005e6d5135cec /sys/compat | |
| parent | bf8c32ec803e260af5129d082675dedd3a76f780 (diff) | |
| download | FreeBSD-src-0dfca1d9b39e77b0e20f454891d05aaadb4b1eea.zip FreeBSD-src-0dfca1d9b39e77b0e20f454891d05aaadb4b1eea.tar.gz | |
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.
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index b0a56b4..1af201e 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -1977,8 +1977,6 @@ linux_ioctl_sound(struct thread *td, struct linux_ioctl_args *args) * 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, struct linux_ioctl_args *args) 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; |
