Skip to content

Commit

Permalink
* CID 97194: Check return from setsockopt().
Browse files Browse the repository at this point in the history 
* CID 739473,739532: Out-of-bounds access/illegal address computation.
* CID 739558: Double close.
* CID 739559: Double close.
* CID 739713: devmask/recmask copy/paste error.
* CID 739714: Fix code indentation level.
* CID 739715: Clean up sockaddr_dump().
  • Loading branch information
@dfc
Harlan Stenn authored and dfc committed Feb 10, 2013
1 parent 8600e19 commit 0f2b49e
Show file tree
Hide file tree
Showing 79 changed files with 490 additions and 207 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
View file
@@ -1,3 +1,11 @@
(4.2.7p354) 2013/02/10 Released by Harlan Stenn <stenn@ntp.org>
* CID 97194: Check return from setsockopt().
* CID 739473,739532: Out-of-bounds access/illegal address computation.
* CID 739558: Double close.
* CID 739559: Double close.
* CID 739713: devmask/recmask copy/paste error.
* CID 739714: Fix code indentation level.
* CID 739715: Clean up sockaddr_dump().
(4.2.7p353) 2013/02/09 Released by Harlan Stenn <stenn@ntp.org>
* [Bug 2326] Check hourly for a new leapfile if the old one expired.
(4.2.7p352) 2013/01/28 Released by Harlan Stenn <stenn@ntp.org>
Expand Down
271 changes: 271 additions & 0 deletions CommitLog
View file
@@ -1,3 +1,274 @@
ChangeSet@1.2909, 2013-02-10 11:50:16+00:00, stenn@deacon.udel.edu
NTP_4_2_7P354
TAG: NTP_4_2_7P354

ChangeLog@1.1260 +1 -0
NTP_4_2_7P354

ntpd/invoke-ntp.conf.texi@1.28 +1 -1
NTP_4_2_7P354

ntpd/invoke-ntp.keys.texi@1.28 +1 -1
NTP_4_2_7P354

ntpd/invoke-ntpd.texi@1.344 +2 -2
NTP_4_2_7P354

ntpd/ntp.conf.5man@1.62 +3 -3
NTP_4_2_7P354

ntpd/ntp.conf.5mdoc@1.62 +3 -3
NTP_4_2_7P354

ntpd/ntp.conf.html@1.27 +1 -1
NTP_4_2_7P354

ntpd/ntp.conf.man.in@1.62 +3 -3
NTP_4_2_7P354

ntpd/ntp.conf.mdoc.in@1.62 +3 -3
NTP_4_2_7P354

ntpd/ntp.keys.5man@1.62 +3 -3
NTP_4_2_7P354

ntpd/ntp.keys.5mdoc@1.62 +3 -3
NTP_4_2_7P354

ntpd/ntp.keys.html@1.28 +1 -1
NTP_4_2_7P354

ntpd/ntp.keys.man.in@1.62 +3 -3
NTP_4_2_7P354

ntpd/ntp.keys.mdoc.in@1.62 +3 -3
NTP_4_2_7P354

ntpd/ntpd-opts.c@1.362 +4 -4
NTP_4_2_7P354

ntpd/ntpd-opts.h@1.362 +3 -3
NTP_4_2_7P354

ntpd/ntpd.1ntpdman@1.173 +3 -3
NTP_4_2_7P354

ntpd/ntpd.1ntpdmdoc@1.173 +3 -3
NTP_4_2_7P354

ntpd/ntpd.html@1.22 +2 -2
NTP_4_2_7P354

ntpd/ntpd.man.in@1.173 +3 -3
NTP_4_2_7P354

ntpd/ntpd.mdoc.in@1.173 +3 -3
NTP_4_2_7P354

ntpdc/invoke-ntpdc.texi@1.341 +2 -2
NTP_4_2_7P354

ntpdc/ntpdc-opts.c@1.356 +4 -4
NTP_4_2_7P354

ntpdc/ntpdc-opts.h@1.356 +3 -3
NTP_4_2_7P354

ntpdc/ntpdc.1ntpdcman@1.172 +2 -2
NTP_4_2_7P354

ntpdc/ntpdc.1ntpdcmdoc@1.172 +2 -2
NTP_4_2_7P354

ntpdc/ntpdc.html@1.185 +2 -2
NTP_4_2_7P354

ntpdc/ntpdc.man.in@1.172 +2 -2
NTP_4_2_7P354

ntpdc/ntpdc.mdoc.in@1.172 +2 -2
NTP_4_2_7P354

ntpq/invoke-ntpq.texi@1.345 +2 -2
NTP_4_2_7P354

ntpq/ntpq-opts.c@1.359 +4 -4
NTP_4_2_7P354

ntpq/ntpq-opts.h@1.359 +3 -3
NTP_4_2_7P354

ntpq/ntpq.1ntpqman@1.173 +2 -2
NTP_4_2_7P354

ntpq/ntpq.1ntpqmdoc@1.173 +2 -2
NTP_4_2_7P354

ntpq/ntpq.html@1.19 +2 -2
NTP_4_2_7P354

ntpq/ntpq.man.in@1.173 +2 -2
NTP_4_2_7P354

ntpq/ntpq.mdoc.in@1.173 +2 -2
NTP_4_2_7P354

ntpsnmpd/invoke-ntpsnmpd.texi@1.344 +2 -2
NTP_4_2_7P354

ntpsnmpd/ntpsnmpd-opts.c@1.359 +4 -4
NTP_4_2_7P354

ntpsnmpd/ntpsnmpd-opts.h@1.359 +3 -3
NTP_4_2_7P354

ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.173 +3 -3
NTP_4_2_7P354

ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.173 +3 -3
NTP_4_2_7P354

ntpsnmpd/ntpsnmpd.html@1.17 +1 -1
NTP_4_2_7P354

ntpsnmpd/ntpsnmpd.man.in@1.173 +3 -3
NTP_4_2_7P354

ntpsnmpd/ntpsnmpd.mdoc.in@1.173 +3 -3
NTP_4_2_7P354

packageinfo.sh@1.357 +1 -1
NTP_4_2_7P354

scripts/invoke-ntp-wait.texi@1.161 +1 -1
NTP_4_2_7P354

scripts/ntp-wait.1ntp-waitman@1.172 +3 -3
NTP_4_2_7P354

scripts/ntp-wait.1ntp-waitmdoc@1.172 +3 -3
NTP_4_2_7P354

scripts/ntp-wait.html@1.177 +1 -1
NTP_4_2_7P354

scripts/ntp-wait.man.in@1.172 +3 -3
NTP_4_2_7P354

scripts/ntp-wait.mdoc.in@1.172 +3 -3
NTP_4_2_7P354

sntp/invoke-sntp.texi@1.341 +2 -2
NTP_4_2_7P354

sntp/sntp-opts.c@1.356 +4 -4
NTP_4_2_7P354

sntp/sntp-opts.h@1.356 +3 -3
NTP_4_2_7P354

sntp/sntp.1sntpman@1.176 +3 -3
NTP_4_2_7P354

sntp/sntp.1sntpmdoc@1.176 +3 -3
NTP_4_2_7P354

sntp/sntp.html@1.356 +2 -2
NTP_4_2_7P354

sntp/sntp.man.in@1.176 +3 -3
NTP_4_2_7P354

sntp/sntp.mdoc.in@1.176 +3 -3
NTP_4_2_7P354

util/invoke-ntp-keygen.texi@1.345 +2 -2
NTP_4_2_7P354

util/ntp-keygen-opts.c@1.359 +4 -4
NTP_4_2_7P354

util/ntp-keygen-opts.h@1.359 +3 -3
NTP_4_2_7P354

util/ntp-keygen.1ntp-keygenman@1.173 +3 -3
NTP_4_2_7P354

util/ntp-keygen.1ntp-keygenmdoc@1.173 +3 -3
NTP_4_2_7P354

util/ntp-keygen.html@1.23 +2 -2
NTP_4_2_7P354

util/ntp-keygen.man.in@1.173 +3 -3
NTP_4_2_7P354

util/ntp-keygen.mdoc.in@1.173 +3 -3
NTP_4_2_7P354

ChangeSet@1.2908, 2013-02-09 20:25:46-05:00, stenn@deacon.udel.edu
CID 739714: Fix code indentation level

ChangeLog@1.1259 +1 -0
CID 739714: Fix code indentation level

ntpd/refclock_irig.c@1.36 +2 -2
CID 739714: Fix code indentation level

ChangeSet@1.2907, 2013-02-09 19:55:02-05:00, stenn@deacon.udel.edu
CID 739715: Clean up sockaddr_dump()

ChangeLog@1.1258 +1 -0
CID 739715: Clean up sockaddr_dump()

ntpd/ntp_io.c@1.376 +2 -1
CID 739715: Clean up sockaddr_dump()

ChangeSet@1.2906, 2013-02-09 19:05:32-05:00, stenn@deacon.udel.edu
CID 97194: Check return from setsockopt()

ChangeLog@1.1257 +1 -0
CID 97194: Check return from setsockopt()

ntpd/ntp_io.c@1.375 +7 -2
CID 97194: Check return from setsockopt()

ChangeSet@1.2905, 2013-02-09 18:28:45-05:00, stenn@deacon.udel.edu
CID 739713: devmask/recmask copy/paste error

ChangeLog@1.1256 +1 -0
CID 739713: devmask/recmask copy/paste error

libntp/audio.c@1.33 +2 -1
CID 739713: devmask/recmask copy/paste error

ChangeSet@1.2904, 2013-02-09 18:17:48-05:00, stenn@deacon.udel.edu
CID 739559: Double close

ChangeLog@1.1255 +2 -1
CID 739559: Double close

lib/isc/unix/net.c@1.18 +0 -1
CID 739559: Double close

ChangeSet@1.2903, 2013-02-09 18:14:26-05:00, stenn@deacon.udel.edu
CID 739558: Double close

ChangeLog@1.1254 +1 -0
CID 739558: Double close

lib/isc/unix/net.c@1.17 +0 -2
CID 739558: Double close

ChangeSet@1.2902, 2013-02-09 18:05:03-05:00, stenn@deacon.udel.edu
CID 739473,739532: Out-of-bounds access/illegal address computation

ChangeLog@1.1253 +1 -0
CID 739473,739532: Out-of-bounds access/illegal address computation

lib/isc/sockaddr.c@1.11 +1 -1
CID 739473,739532: Out-of-bounds access/illegal address computation

ChangeSet@1.2901, 2013-02-09 11:31:13+00:00, stenn@deacon.udel.edu
NTP_4_2_7P353
TAG: NTP_4_2_7P353
Expand Down
20 changes: 10 additions & 10 deletions configure
View file
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for ntp 4.2.7p353.
# Generated by GNU Autoconf 2.68 for ntp 4.2.7p354.
#
# Report bugs to <http://bugs.ntp.org./>.
#
Expand Down Expand Up @@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ntp'
PACKAGE_TARNAME='ntp'
PACKAGE_VERSION='4.2.7p353'
PACKAGE_STRING='ntp 4.2.7p353'
PACKAGE_VERSION='4.2.7p354'
PACKAGE_STRING='ntp 4.2.7p354'
PACKAGE_BUGREPORT='http://bugs.ntp.org./'
PACKAGE_URL='http://www.ntp.org./'

Expand Down Expand Up @@ -1525,7 +1525,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ntp 4.2.7p353 to adapt to many kinds of systems.
\`configure' configures ntp 4.2.7p354 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1595,7 +1595,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ntp 4.2.7p353:";;
short | recursive ) echo "Configuration of ntp 4.2.7p354:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1816,7 +1816,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ntp configure 4.2.7p353
ntp configure 4.2.7p354
generated by GNU Autoconf 2.68

Copyright (C) 2010 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2641,7 +2641,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by ntp $as_me 4.2.7p353, which was
It was created by ntp $as_me 4.2.7p354, which was
generated by GNU Autoconf 2.68. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3588,7 +3588,7 @@ fi

# Define the identity of the package.
PACKAGE='ntp'
VERSION='4.2.7p353'
VERSION='4.2.7p354'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -36020,7 +36020,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ntp $as_me 4.2.7p353, which was
This file was extended by ntp $as_me 4.2.7p354, which was
generated by GNU Autoconf 2.68. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -36087,7 +36087,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ntp config.status 4.2.7p353
ntp config.status 4.2.7p354
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion lib/isc/sockaddr.c
View file
Expand Up @@ -220,7 +220,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
case AF_INET6:
in6 = &sockaddr->type.sin6.sin6_addr;
if (IN6_IS_ADDR_V4MAPPED(in6)) {
s = (const unsigned char *)&in6[12];
s = (const unsigned char *)&in6 + 12;
length = sizeof(sockaddr->type.sin.sin_addr.s_addr);
} else {
s = (const unsigned char *)in6;
Expand Down
3 changes: 0 additions & 3 deletions lib/isc/unix/net.c
View file
Expand Up @@ -302,8 +302,6 @@ try_ipv6only(void) {
goto close;
}

close(s);

ipv6only_result = ISC_R_SUCCESS;

close:
Expand Down Expand Up @@ -358,7 +356,6 @@ try_ipv6pktinfo(void) {
goto close;
}

close(s);
ipv6pktinfo_result = ISC_R_SUCCESS;

close:
Expand Down

0 comments on commit 0f2b49e

Please sign in to comment.