Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Dec 2013 12:41:04 -0600
From:      Larry Rosenman <ler@lerctr.org>
To:        "George V. Neville-Neil" <gnn@FreeBSD.org>
Cc:        ray@FreeBSD.org, freebsd-current@freebsd.org
Subject:   Re: svn commit: r259221 - head/sys/dev/vt
Message-ID:  <20131211184104.GA1687@borg.lerctr.org>
In-Reply-To: <201312111718.rBBHIAgM065186@svn.freebsd.org>
References:  <201312111718.rBBHIAgM065186@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This looks like it fixes my -CURRENT crash..

Thanks GNN/JHB
On Wed, Dec 11, 2013 at 05:18:10PM +0000, George V. Neville-Neil 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) {
> _______________________________________________
> svn-src-all@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

-- 
Larry Rosenman                     http://www.lerctr.org/~ler
Phone: +1 214-642-9640                 E-Mail: ler@lerctr.org
US Mail: 108 Turvey Cove, Hutto, TX 78634-5688



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