Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Apr 2002 00:22:37 +1000 (EST)
From:      Bruce Evans <bde@zeta.org.au>
To:        Poul-Henning Kamp <phk@FreeBSD.org>
Cc:        cvs-committers@FreeBSD.org, <cvs-all@FreeBSD.org>
Subject:   Re: cvs commit: src/sbin/sysctl sysctl.c src/sys/kern kern_clock.c src/sys/sys time.h
Message-ID:  <20020417001444.H8131-100000@gamplex.bde.org>
In-Reply-To: <200204151211.g3FCB6u07260@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 15 Apr 2002, Poul-Henning Kamp wrote:

> phk         2002/04/15 05:11:06 PDT
>
>   Modified files:
>     sbin/sysctl          sysctl.c
>     sys/kern             kern_clock.c
>     sys/sys              time.h
>   Log:
>   Take the "tickadj" element out of struct clockinfo.  Our adjtime(2)
>   implementation is being changed and the very concept of tickadj will
>   no longer be meaningful.
>
>   Revision  Changes    Path
>   1.44      +2 -2      src/sbin/sysctl/sysctl.c
>   1.138     +0 -1      src/sys/kern/kern_clock.c
>   1.53      +0 -1      src/sys/sys/time.h

This gratuitously breaks binary compatibility of the kern.clockrate sysctl.

The following untested patch should also fix leakage of kernel context to
userland via unnamed padding in the struct, if any.

%%%
Index: kern/kern_clock.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/kern_clock.c,v
retrieving revision 1.138
diff -u -1 -r1.138 kern_clock.c
--- kern/kern_clock.c	15 Apr 2002 12:10:51 -0000	1.138
+++ kern/kern_clock.c	16 Apr 2002 14:18:45 -0000
@@ -484,2 +519,3 @@
 	 */
+	bzero(&clkinfo, sizeof(clkinfo));
 	clkinfo.hz = hz;
Index: sys/time.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/time.h,v
retrieving revision 1.53
diff -u -1 -r1.53 time.h
--- sys/time.h	15 Apr 2002 12:11:06 -0000	1.53
+++ sys/time.h	15 Apr 2002 18:57:03 -0000
@@ -264,2 +271,3 @@
 	int	tick;		/* micro-seconds per hz tick */
+	int	spare;
 	int	stathz;		/* statistics clock frequency */
%%%

Bruce


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message




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