svn commit: r259221 - head/sys/dev/vt

[Aleksandr Rybalko]

On Wed, 11 Dec 2013 17:18:10 +0000 (UTC)
"George V. Neville-Neil" <gnn at FreeBSD.org> wrote:

> Author: gnn
> Date: Wed Dec 11 17:18:10 2013
> New Revision: 259221
> URL: http://svnweb.freebsd.org/changeset/base/259221
> 
> Log:
>   Fix a panic when booting with kernels that have FREEBBSD_COMPAT
>   4, 5, 6 or 43 by only thunking the data parameter for old ioctls
>   compatability ioctls instead of doing it for all of them.
>   
>   Submitted by:	jhb@
> 
> Modified:
>   head/sys/dev/vt/vt_core.c
> 
> Modified: head/sys/dev/vt/vt_core.c
> ==============================================================================
> --- head/sys/dev/vt/vt_core.c	Wed Dec 11 15:32:28 2013
> (r259220) +++ head/sys/dev/vt/vt_core.c	Wed Dec 11 17:18:10
> 2013	(r259221) @@ -1321,9 +1321,12 @@ vtterm_ioctl(struct
> terminal *tm, u_long case _IO('c', 110):
>  		cmd = CONS_SETKBD;
>  		break;
> +	default:
> +		goto skip_thunk;
>  	}
>  	ival = IOCPARM_IVAL(data);
>  	data = (caddr_t)&ival;
> +skip_thunk:
>  #endif
>  
>  	switch (cmd) {

Many thanks George and John!

Next time I will just copy old code instead of try to optimize it :-D

Thanks!

WBW
-- 
Aleksandr Rybalko <ray at freebsd.org>