diff options
| author | roberto <roberto@FreeBSD.org> | 2009-12-15 14:58:10 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2009-12-15 14:58:10 +0000 |
| commit | 230e76b5380d386df4ba9fee065378a39a10e8b5 (patch) | |
| tree | 2928c8428ba1c1401c7dcd5d3c3c610fbb90b794 /contrib/ntp/html | |
| parent | 2bc44b96096e82af8f7720c1883039f28c130aa0 (diff) | |
| parent | ecc42837d301a8d8e257020b30492277ad558d30 (diff) | |
| download | FreeBSD-src-230e76b5380d386df4ba9fee065378a39a10e8b5.zip FreeBSD-src-230e76b5380d386df4ba9fee065378a39a10e8b5.tar.gz | |
Merge 4.2.4p8 into contrib (r200452 & r200454).
Subversion is being difficult here so take a hammer and get it in.
MFC after: 2 weeks
Security: CVE-2009-3563
Diffstat (limited to 'contrib/ntp/html')
| -rw-r--r-- | contrib/ntp/html/build/hints/solaris.xtra.4095849 | 74 | ||||
| -rw-r--r-- | contrib/ntp/html/copyright.html | 2 | ||||
| -rw-r--r-- | contrib/ntp/html/drivers/driver40.html | 151 |
3 files changed, 178 insertions, 49 deletions
diff --git a/contrib/ntp/html/build/hints/solaris.xtra.4095849 b/contrib/ntp/html/build/hints/solaris.xtra.4095849 new file mode 100644 index 0000000..8d3ce80 --- /dev/null +++ b/contrib/ntp/html/build/hints/solaris.xtra.4095849 @@ -0,0 +1,74 @@ + Bug Id: 4095849 + Category: kernel + Subcategory: syscall + State: evaluated + Synopsis: time_constant value >6 with PLL in use leads to integer divide + zero trap panic + Description: +If the time_constant parameter is 7 or higher, and the phase-lock looping model +is in use, the system will take a "integer divide zero trap" panic in +the clock routine as soon as the time_offset becomes non-zero. + +time_constant defaults to 0. The only place it is set is in the ntp_adjtime +system call, from the 'constant' element of the timex structure argument. + + Work around: +Never set the constant element of the timex structure passed to ntp_adjtime to +a value larger than 6. + +satish.mynam@Eng 1998-04-30 +1. Use Sun's version of NTP software instead of PD version. This problem +is not seen with Sun's NTP version (which is mostly eqivalent to PD NTP 3.4 +plus some Sun's local functionality futures). + +2. Workaround for the public domain NTP version ONLY: + ===================================================== +The workaround for public domain NTP version is to disable the +KERNEL_PLL from the NTP code. This way ntp_Adjtime() system call is +totally bypassed without sacrificing any of the functionality of the +NTP. The only hit you might see is the way kernel precision timminig +is done without the PLL algorithm in the kernel. + + The easiest way to disable ntp_adjtime option is(without changing + any makefiles or other config files) to disable the KERNEL_PLL + value in the ./config.h file. + +After doing a ./configure for probing for all the necessary tools(compilers, +os version, libraries), please comment out KERNEL_PLL macro in +the ./config.h file. This will disable the KERNEL_PLL part of the source +code and the newly obtained xntpd is just similar to the old one but it +does not use ntp_adjtime() system call. This prevents it from panic'ng +the kernel. + +/*#define KERNEL_PLL 1*/ + +I complied a new xntpd binary this way and it does nothave any ntp_adjtime() +related stuff. + +Default: +======= +/net/divya/export/home/mynam/public_domain/ntp/xntp3-5.92/xntpd>strings +xntpd | +grep ntp_adjtime +354:adj_frequency: ntp_adjtime failed: %m +357:loop_config: ntp_adjtime() failed: %m +435:get_kernel_info: ntp_adjtime() failed: %m + +With KERNEL_PLL disabled in config.h file +-======================= + +/net/divya/export/home/mynam/public_domain/ntp/xntp3-5.92/xntpd>strings +xntpd.nopll | grep ntp_adjtime + + Integrated in releases: + Duplicate of: + Patch id: + See also: 4133517 + Summary: +If the time_constant parameter is 7 or higher, and the phase-lock looping model +is in use, the system will take a "integer divide zero trap" panic in +the clock routine as soon as the time_offset becomes non-zero. + +time_constant defaults to 0. The only place it is set is in the ntp_adjtime +system call, from the 'constant' element of the timex structure argument. +---------------------------------------------------------------------------- diff --git a/contrib/ntp/html/copyright.html b/contrib/ntp/html/copyright.html index 471069a..cf34979 100644 --- a/contrib/ntp/html/copyright.html +++ b/contrib/ntp/html/copyright.html @@ -19,7 +19,7 @@ <pre> *********************************************************************** * * -* Copyright (c) David L. Mills 1992-2008 * +* Copyright (c) David L. Mills 1992-2009 * * * * Permission to use, copy, modify, and distribute this software and * * its documentation for any purpose with or without fee is hereby * diff --git a/contrib/ntp/html/drivers/driver40.html b/contrib/ntp/html/drivers/driver40.html index 54e1747..1901dcd 100644 --- a/contrib/ntp/html/drivers/driver40.html +++ b/contrib/ntp/html/drivers/driver40.html @@ -5,7 +5,10 @@ <head> <meta http-equiv="content-type" content="text/html;charset=iso-8859-1"> <meta name="generator" content="HTML Tidy, see www.w3.org"> + <meta http-equiv="Content-Script-Type" content="text/javascript"> <title>JJY Receivers</title> + <link rev="made" href="http://www.bea.hi-ho.ne.jp/abetakao/"> + <link rel="start" href="http://www.eecis.udel.edu/~mills/ntp/html/refclock.html"> <link href="scripts/style.css" type="text/css" rel="stylesheet"> </head> @@ -13,122 +16,174 @@ <h3>JJY Receivers</h3> <hr> <h4>Synopsis</h4> - Address: 127.127.40.<i>u</i><br> - Reference ID: <tt>JJY</tt><br> - Driver ID: <tt>JJY</tt><br> - Serial Port: <tt>/dev/jjy<i>u</i></tt>; 9600 baud, 8-bits, no parity, 1 stop bit + Address: 127.127.40.<em>u</em><br> + Reference ID: <code>JJY</code><br> + Driver ID: <code>JJY</code><br> + Serial Port: <code>/dev/jjy<em>u</em></code>; 9600|4800(See corresponding receiver) baud, 8-bits, no parity, 1 stop bit <h4>Description</h4> <p>This driver supports the following JJY receivers sold in Japan.</p> <ul> <li>Tristate Ltd. JJY01 <a href="http://www.tristate.ne.jp/">http://www.tristate.ne.jp/</a> (Japanese only)<br> <dl> - <dt>Time code format + <dt>NTP configuration ( ntp.conf )</dt> + <dd> + <p>server 127.127.40.X mode 1</p> + <br> + </dd> + <dt>RS-232C</dt> + <dd> + <p>9600 Baud</p> + <br> + </dd> + <dt>Time code format</dt> <dd><br> - <table> + <table summary="CommandAndReply"> <tr> <td>Command</td> - <td> </td> + <td> --> </td> <td>Reply</td> </tr> <tr> - <td><tt>date<CR><LF></tt></td> - <td> </td> - <td><tt>YYYY/MM/DD WWW<CR><LF></tt></td> + <td><code>date<CR><LF></code></td> + <td> --> </td> + <td><code>YYYY/MM/DD WWW<CR><LF></code></td> </tr> <tr> - <td><tt>stim<CR><LF></tt></td> - <td> </td> - <td><tt>HH:MM:SS<CR><LF></tt></td> + <td><code>stim<CR><LF></code></td> + <td> --> </td> + <td><code>HH:MM:SS<CR><LF></code></td> </tr> </table> <br> - <dt>NTP configuration ( ntp.conf ) - <dd> - <p>server 127.127.40.X mode 1</p> - <br> + </dd> </dl> <li>C-DEX Co.,Ltd. JST2000 <a href="http://www.c-dex.co.jp/">http://www.c-dex.co.jp/</a> (Japanese only)<br> <dl> - <dt>Time code format + <dt>NTP configuration ( ntp.conf )</dt> + <dd> + <p>server 127.127.40.X mode 2</p> + <br> + </dd> + <dt>RS-232C</dt> + <dd> + <p>9600 Baud</p> + <br> + </dd> + <dt>Time code format</dt> <dd><br> - <table> + <table summary="CommandAndReply"> <tr> <td>Command</td> - <td> </td> + <td> --> </td> <td>Reply</td> </tr> <tr> - <td><tt><ENQ>1J<ETX></tt></td> - <td> </td> - <td><tt><STX>JYYMMDD HHMMSSS<ETX></tt></td> + <td><code><ENQ>1J<ETX></code></td> + <td> --> </td> + <td><code><STX>JYYMMDD HHMMSSS<ETX></code></td> </tr> </table> <br> - <dt>NTP configuration ( ntp.conf ) - <dd> - <p>server 127.127.40.X mode 2</p> - <br> + </dd> </dl> <li> <p>Echo Keisokuki Co.,Ltd. LT-2000 <a href="http://www.clock.co.jp/">http://www.clock.co.jp/</a> (Japanese only)</p> <dl> - <dt>Time code format + <dt>NTP configuration ( ntp.conf )</dt> + <dd> + <p>server 127.127.40.X mode 3</p> + <br> + </dd> + <dt>RS-232C</dt> + <dd> + <p>9600 Baud</p> + <br> + </dd> + <dt>Time code format</dt> <dd><br> <table summary="CommandAndReply"> <tr> <td>Command</td> - <td> </td> + <td> --> </td> <td>Reply</td> </tr> <tr> <td><code>C</code></td> - <td></td> + <td> --> </td> <td>( Mode 2 : Continuous )</td> </tr> <tr> - <td></td> + <td>( Every second before 0.5 second )</td> <td></td> <td><code>YYMMDDWHHMMSS<ST1><ST2><ST3><ST4><CR></code></td> </tr> <tr> <td><code>#</code></td> - <td></td> - <td>( Mode 1 : Request&Send )</td> + <td> --> </td> + <td>( Mode 1 : Request&Send )</td> </tr> </table> <br> - <dt>NTP configuration ( ntp.conf ) + </dd> + </dl> + <li> + <p>CITIZEN T.I.C. CO.,LTD. JJY-200 <a href="http://www.tic-citizen.co.jp/">http://www.tic-citizen.co.jp/</a> (Japanese only)</p> + <dl> + <dt>NTP configuration ( ntp.conf )</dt> <dd> - <p>server 127.127.40.X mode 3</p> + <p>server 127.127.40.X mode 4</p> + <br> + </dd> + <dt>RS-232C</dt> + <dd> + <p>4800 Baud</p> + <br> + </dd> + <dt>Time code format</dt> + <dd><br> + <table summary="CommandAndReply"> + <tr> + <td>Command</td> + <td> --> </td> + <td>Reply</td> + </tr> + <tr> + <td>( Every second )</td> + <td></td> + <td><code>'XX YY/MM/DD W HH:MM:SS<CR></code></td> + </tr> + </table> + <br> + </dd> </dl> </ul> <p>JJY is the radio station which transmites the JST (Japan Standard Time) in long wave radio. The station JJY is operated by the National Institute of Information and Communications Technology. An operating announcement and some information are avaiable from <a href="http://www.nict.go.jp/">http://www.nict.go.jp/</a> (English and Japanese) and <a href="http://jjy.nict.go.jp/">http://jjy.nict.go.jp/</a> (English and Japanese)</p> <p>The user is expected to provide a symbolic link to an available serial port device. This is typically performed by a command such as:</p> - <p><tt>ln -s /dev/ttyS0 /dev/jjy0</tt></p> - <p>Windows NT does not support symbolic links to device files. COM<i>X</i>: is the unit used by the driver, based on the refclock unit number, where unit 1 corresponds to COM1: and unit 3 corresponds to COM3:</p> + <p><code>ln -s /dev/ttyS0 /dev/jjy0</code></p> + <p>Windows NT does not support symbolic links to device files. COM<em>X</em>: is the unit used by the driver, based on the refclock unit number, where unit 1 corresponds to COM1: and unit 3 corresponds to COM3:</p> <h4>Monitor Data</h4> - <p>The driver writes each timecode as received to the <tt>clockstats</tt> file.</p> + <p>The driver writes each timecode as received to the <code>clockstats</code> file.</p> <h4>Fudge Factors</h4> <dl> - <dt><tt>time1 <i>time</i></tt> + <dt><code>time1 <em>time</em></code> <dd>Specifies the time offset calibration factor, in seconds and fraction, with default 0.0. - <dt><tt>time2 <i>time</i></tt> + <dt><code>time2 <em>time</em></code> <dd>Not used by this driver. - <dt><tt>stratum <i>number</i></tt> + <dt><code>stratum <em>number</em></code> <dd>Specifies the driver stratum, in decimal from 0 to 15, with default 0. - <dt><tt>refid <i>string</i></tt> - <dd>Specifies the driver reference identifier, an ASCII string from one to four characters, with default <tt>JJY</tt>. - <dt><tt>flag1 0 | 1</tt> + <dt><code>refid <em>string</em></code> + <dd>Specifies the driver reference identifier, an ASCII string from one to four characters, with default <code>JJY</code>. + <dt><code>flag1 0 | 1</code> <dd>Not used by this driver. - <dt><tt>flag2 0 | 1</tt> + <dt><code>flag2 0 | 1</code> <dd>Not used by this driver. - <dt><tt>flag3 0 | 1</tt> + <dt><code>flag3 0 | 1</code> <dd>Not used by this driver. - <dt><tt>flag4 0 | 1</tt> + <dt><code>flag4 0 | 1</code> <dd>Not used by this driver. </dl> <hr> <script type="text/javascript" language="javascript" src="scripts/footer.txt"></script> </body> -</html>
\ No newline at end of file +</html> |
