CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Wed Jan 27 21:45:44 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1257 To generate a diff of this commit: cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.46 src/doc/CHANGES-5.0.2:1.1.2.47 --- src/doc/CHANGES-5.0.2:1.1.2.46 Wed Jan 27 20:45:27 2010 +++ src/doc/CHANGES-5.0.2 Wed Jan 27 21:45:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.46 2010/01/27 20:45:27 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.47 2010/01/27 21:45:44 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -1110,15 +1110,27 @@ Obj_Entry. [skrll, ticket #1249] -xsrc/external/mit/expat/dist/lib/xmlparse.c 1.2 +sys/dev/ic/mfi.c1.31 + + bio(4) is MP-safe but mfi(4) is not. So get the kernel_lock at + mfi_ioctl() entry and release it on exit. + [bouyer, #ticket 1257] + +xsrc/external/mit/expat/dist/lib/xmlparse.c 1.2 Add patch from upstream CVS to fix CVE-2009-3560 (possible DOS due to crash on bad input). [tron, ticket #1283] -xsrc/xfree/xc/extras/expat/lib/xmlparse.c 1.2 +xsrc/xfree/xc/extras/expat/lib/xmlparse.c 1.2 Add patch from upstream CVS to fix CVE-2009-3560 (possible DOS due to crash on bad input). [tron, ticket #1284] +sys/dev/ic/mfi.c1.31 + + bio(4) is MP-safe but mfi(4) is not. So get the kernel_lock at + mfi_ioctl() entry and release it on exit. + [bouyer, #ticket 1257] +
CVS commit: [netbsd-5-0] src/libexec/ld.elf_so
Module Name:src Committed By: bouyer Date: Sat Jan 23 17:34:12 UTC 2010 Modified Files: src/libexec/ld.elf_so [netbsd-5-0]: rtld.h Log Message: Pull up following revision(s) (requested by skrll in ticket #1249): libexec/ld.elf_so/rtld.h: revisions 1.87, 1.88 libexec/ld.elf_so/reloc.c: revision 1.101 Restore backwards compatibility for binaries referencing the main Obj_Entry. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.79.8.1 src/libexec/ld.elf_so/rtld.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/rtld.h diff -u src/libexec/ld.elf_so/rtld.h:1.79 src/libexec/ld.elf_so/rtld.h:1.79.8.1 --- src/libexec/ld.elf_so/rtld.h:1.79 Sat Oct 4 09:37:12 2008 +++ src/libexec/ld.elf_so/rtld.h Sat Jan 23 17:34:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.h,v 1.79 2008/10/04 09:37:12 skrll Exp $ */ +/* $NetBSD: rtld.h,v 1.79.8.1 2010/01/23 17:34:12 bouyer Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -130,7 +130,6 @@ caddr_t entry; /* Entry point */ const Elf_Phdr *__junk001; size_t pathlen; /* Pathname length */ - void *ehdr; /* Items from the dynamic section. */ Elf_Addr *pltgot; /* PLTGOT table */ @@ -195,6 +194,8 @@ Objlist dagmembers; /* DAG has these members (%) */ dev_t dev; /* Object's filesystem's device */ ino_t ino; /* Object's inode number */ + + void *ehdr; } Obj_Entry; #if defined(_RTLD_SOURCE)
CVS commit: [netbsd-5-0] src/libexec/ld.elf_so
Module Name:src Committed By: bouyer Date: Sat Jan 23 17:39:11 UTC 2010 Modified Files: src/libexec/ld.elf_so [netbsd-5-0]: rtld.h Log Message: Back out ticket 1249 for now, it may not be needed on netbsd-5-0. To generate a diff of this commit: cvs rdiff -u -r1.79.8.1 -r1.79.8.2 src/libexec/ld.elf_so/rtld.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/rtld.h diff -u src/libexec/ld.elf_so/rtld.h:1.79.8.1 src/libexec/ld.elf_so/rtld.h:1.79.8.2 --- src/libexec/ld.elf_so/rtld.h:1.79.8.1 Sat Jan 23 17:34:12 2010 +++ src/libexec/ld.elf_so/rtld.h Sat Jan 23 17:39:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.h,v 1.79.8.1 2010/01/23 17:34:12 bouyer Exp $ */ +/* $NetBSD: rtld.h,v 1.79.8.2 2010/01/23 17:39:11 bouyer Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -130,6 +130,7 @@ caddr_t entry; /* Entry point */ const Elf_Phdr *__junk001; size_t pathlen; /* Pathname length */ + void *ehdr; /* Items from the dynamic section. */ Elf_Addr *pltgot; /* PLTGOT table */ @@ -194,8 +195,6 @@ Objlist dagmembers; /* DAG has these members (%) */ dev_t dev; /* Object's filesystem's device */ ino_t ino; /* Object's inode number */ - - void *ehdr; } Obj_Entry; #if defined(_RTLD_SOURCE)
CVS commit: [netbsd-5-0] src/libexec/ld.elf_so
Module Name:src Committed By: bouyer Date: Sat Jan 23 20:37:01 UTC 2010 Modified Files: src/libexec/ld.elf_so [netbsd-5-0]: rtld.h Log Message: Pull up following revision(s) (requested by skrll in ticket #1249): libexec/ld.elf_so/rtld.h: revision 1.88 Restore backwards compatibility for binaries referencing the main Obj_Entry. To generate a diff of this commit: cvs rdiff -u -r1.79.8.2 -r1.79.8.3 src/libexec/ld.elf_so/rtld.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/rtld.h diff -u src/libexec/ld.elf_so/rtld.h:1.79.8.2 src/libexec/ld.elf_so/rtld.h:1.79.8.3 --- src/libexec/ld.elf_so/rtld.h:1.79.8.2 Sat Jan 23 17:39:11 2010 +++ src/libexec/ld.elf_so/rtld.h Sat Jan 23 20:37:01 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.h,v 1.79.8.2 2010/01/23 17:39:11 bouyer Exp $ */ +/* $NetBSD: rtld.h,v 1.79.8.3 2010/01/23 20:37:01 bouyer Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -130,7 +130,6 @@ caddr_t entry; /* Entry point */ const Elf_Phdr *__junk001; size_t pathlen; /* Pathname length */ - void *ehdr; /* Items from the dynamic section. */ Elf_Addr *pltgot; /* PLTGOT table */ @@ -195,6 +194,8 @@ Objlist dagmembers; /* DAG has these members (%) */ dev_t dev; /* Object's filesystem's device */ ino_t ino; /* Object's inode number */ + + void *ehdr; } Obj_Entry; #if defined(_RTLD_SOURCE)
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Jan 23 20:37:34 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1249 To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.44 src/doc/CHANGES-5.0.2:1.1.2.45 --- src/doc/CHANGES-5.0.2:1.1.2.44 Fri Jan 22 22:18:10 2010 +++ src/doc/CHANGES-5.0.2 Sat Jan 23 20:37:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.44 2010/01/22 22:18:10 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.45 2010/01/23 20:37:34 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -1104,3 +1104,9 @@ Fix CVE-2009-4355. [taca, ticket #1265] +libexec/ld.elf_so/rtld.h 1.88 + + Restore backwards compatibility for binaries referencing the main + Obj_Entry. + [skrll, ticket #1249] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: snj Date: Fri Jan 22 22:05:42 UTC 2010 Modified Files: src/dist/bind [netbsd-5-0]: CHANGES FAQ FAQ.xml version src/dist/bind/bin/named [netbsd-5-0]: query.c src/dist/bind/bin/tests/system [netbsd-5-0]: conf.sh.in src/dist/bind/bin/tests/system/dnssec [netbsd-5-0]: tests.sh src/dist/bind/bin/tests/system/dnssec/ns1 [netbsd-5-0]: sign.sh src/dist/bind/bin/tests/system/dnssec/ns2 [netbsd-5-0]: example.db.in sign.sh src/dist/bind/doc/arm [netbsd-5-0]: Bv9ARM.pdf src/dist/bind/doc/rfc [netbsd-5-0]: index src/dist/bind/lib/dns [netbsd-5-0]: rbtdb.c resolver.c validator.c src/dist/bind/lib/dns/include/dns [netbsd-5-0]: db.h types.h src/dist/bind/lib/lwres/man [netbsd-5-0]: lwres.html lwres_buffer.html lwres_config.html lwres_context.html lwres_gabn.html lwres_gai_strerror.html lwres_getaddrinfo.html lwres_gethostent.html lwres_getipnode.html lwres_getnameinfo.html lwres_getrrsetbyname.html lwres_gnba.html lwres_hstrerror.html lwres_inetntop.html lwres_noop.html lwres_packet.html lwres_resutil.html src/distrib/sets/lists/base [netbsd-5-0]: md.amd64 md.sparc64 shl.mi src/doc [netbsd-5-0]: 3RDPARTY src/lib/libdns [netbsd-5-0]: shlib_version Added Files: src/dist/bind/bin/tests/system/pending [netbsd-5-0]: clean.sh prereq.sh setup.sh tests.sh src/dist/bind/bin/tests/system/pending/ns1 [netbsd-5-0]: named.conf root.db.in sign.sh src/dist/bind/bin/tests/system/pending/ns2 [netbsd-5-0]: example.com.db.in example.db.in forgery.db named.conf sign.sh src/dist/bind/bin/tests/system/pending/ns3 [netbsd-5-0]: hostile.db mail.example.db named.conf src/dist/bind/bin/tests/system/pending/ns4 [netbsd-5-0]: named.conf src/dist/bind/doc/draft [netbsd-5-0]: draft-ietf-6man-text-addr-representation-01.txt draft-ietf-behave-dns64-01.txt draft-ietf-dnsext-axfr-clarify-12.txt draft-ietf-dnsext-dns-tcp-requirements-01.txt draft-ietf-dnsext-dnssec-bis-updates-09.txt draft-ietf-dnsext-dnssec-gost-05.txt draft-ietf-dnsext-rfc2671bis-edns0-02.txt draft-ietf-dnsext-rfc2672bis-dname-18.txt draft-ietf-dnsext-rfc3597-bis-00.txt draft-ietf-dnsext-tsig-md5-deprecated-03.txt draft-ietf-dnsop-default-local-zones-09.txt draft-ietf-dnsop-name-server-management-reqs-02.txt src/dist/bind/doc/rfc [netbsd-5-0]: rfc1912.txt rfc3755.txt rfc4294.txt rfc4339.txt rfc4471.txt rfc4472.txt rfc4697.txt rfc4955.txt rfc4956.txt rfc5001.txt rfc5011.txt rfc5452.txt rfc5625.txt rfc5702.txt Removed Files: src/dist/bind/doc/draft [netbsd-5-0]: draft-baba-dnsext-acl-reqts-01.txt draft-daigle-napstr-04.txt draft-danisch-dns-rr-smtp-03.txt draft-dnsext-opcode-discover-02.txt draft-durand-dnsop-dynreverse-00.txt draft-ietf-dnsext-2929bis-01.txt draft-ietf-dnsext-axfr-clarify-05.txt draft-ietf-dnsext-dns-name-p-s-00.txt draft-ietf-dnsext-dnssec-2535typecode-change-06.txt draft-ietf-dnsext-dnssec-bis-updates-01.txt draft-ietf-dnsext-dnssec-experiments-03.txt draft-ietf-dnsext-dnssec-online-signing-02.txt draft-ietf-dnsext-dnssec-opt-in-07.txt draft-ietf-dnsext-dnssec-rsasha256-00.txt draft-ietf-dnsext-dnssec-trans-02.txt draft-ietf-dnsext-ds-sha256-05.txt draft-ietf-dnsext-forgery-resilience-00.txt draft-ietf-dnsext-keyrr-key-signing-flag-12.txt draft-ietf-dnsext-mdns-46.txt draft-ietf-dnsext-nsec3-12.txt draft-ietf-dnsext-nsid-01.txt draft-ietf-dnsext-rfc2536bis-dsa-07.txt draft-ietf-dnsext-rfc2539bis-dhk-07.txt draft-ietf-dnsext-rfc2672bis-dname-06.txt draft-ietf-dnsext-signed-nonexistence-requirements-01.txt draft-ietf-dnsext-tkey-renewal-mode-05.txt draft-ietf-dnsext-trustupdate-threshold-00.txt draft-ietf-dnsext-trustupdate-timers-05.txt draft-ietf-dnsext-tsig-sha-06.txt draft-ietf-dnsext-wcard-clarify-10.txt draft-ietf-dnsop-default-local-zones-03.txt draft-ietf-dnsop-ipv6-dns-configuration-06.txt draft-ietf-dnsop-ipv6-dns-issues-11.txt draft-ietf-dnsop-ipv6-transport-guidelines-01.txt draft-ietf-dnsop-key-rollover-requirements-02.txt draft-ietf-dnsop-serverid-06.txt draft-ietf-enum-e164-gstn-np-05.txt draft-ietf-ipv6-node-requirements-08.txt draft-ietf-secsh-dns-05.txt
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/crypto/comp
Module Name:src
Committed By: snj
Date: Fri Jan 22 22:17:02 UTC 2010
Modified Files:
src/crypto/dist/openssl/crypto/comp [netbsd-5-0]: c_zlib.c
Log Message:
Apply patch (requested by taca in ticket #1265):
Fix CVE-2009-4355.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.8.1 \
src/crypto/dist/openssl/crypto/comp/c_zlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/crypto/comp/c_zlib.c
diff -u src/crypto/dist/openssl/crypto/comp/c_zlib.c:1.1.1.7 src/crypto/dist/openssl/crypto/comp/c_zlib.c:1.1.1.7.8.1
--- src/crypto/dist/openssl/crypto/comp/c_zlib.c:1.1.1.7 Fri May 9 21:34:23 2008
+++ src/crypto/dist/openssl/crypto/comp/c_zlib.c Fri Jan 22 22:17:01 2010
@@ -136,15 +136,6 @@
static int zlib_stateful_ex_idx = -1;
-static void zlib_stateful_free_ex_data(void *obj, void *item,
- CRYPTO_EX_DATA *ad, int ind,long argl, void *argp)
- {
- struct zlib_state *state = (struct zlib_state *)item;
- inflateEnd(state-istream);
- deflateEnd(state-ostream);
- OPENSSL_free(state);
- }
-
static int zlib_stateful_init(COMP_CTX *ctx)
{
int err;
@@ -188,6 +179,12 @@
static void zlib_stateful_finish(COMP_CTX *ctx)
{
+ struct zlib_state *state =
+ (struct zlib_state *)CRYPTO_get_ex_data(ctx-ex_data,
+ zlib_stateful_ex_idx);
+ inflateEnd(state-istream);
+ deflateEnd(state-ostream);
+ OPENSSL_free(state);
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_COMP,ctx,ctx-ex_data);
}
@@ -402,7 +399,7 @@
if (zlib_stateful_ex_idx == -1)
zlib_stateful_ex_idx =
CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP,
- 0,NULL,NULL,NULL,zlib_stateful_free_ex_data);
+ 0,NULL,NULL,NULL,NULL);
CRYPTO_w_unlock(CRYPTO_LOCK_COMP);
if (zlib_stateful_ex_idx == -1)
goto err;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Fri Jan 22 22:18:10 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Tickets 1264 and 1265. To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.43 src/doc/CHANGES-5.0.2:1.1.2.44 --- src/doc/CHANGES-5.0.2:1.1.2.43 Thu Jan 21 08:41:39 2010 +++ src/doc/CHANGES-5.0.2 Fri Jan 22 22:18:10 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.43 2010/01/21 08:41:39 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.44 2010/01/22 22:18:10 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -973,3 +973,134 @@ Signedness bug/crash in azalia. Fixes PR 42604. [tonnerre, ticket #1258] +dist/bind/CHANGESpatch +dist/bind/FAQ patch +dist/bind/FAQ.xmlpatch +dist/bind/bin/named/query.c patch +dist/bind/bin/tests/system/conf.sh.in patch +dist/bind/bin/tests/system/dnssec/ns1/sign.sh patch +dist/bind/bin/tests/system/dnssec/ns2/example.db.in patch +dist/bind/bin/tests/system/dnssec/ns2/sign.sh patch +dist/bind/bin/tests/system/dnssec/tests.sh patch +dist/bind/bin/tests/system/pending/clean.sh patch +dist/bind/bin/tests/system/pending/ns1/named.conf patch +dist/bind/bin/tests/system/pending/ns1/root.db.in patch +dist/bind/bin/tests/system/pending/ns1/sign.sh patch +dist/bind/bin/tests/system/pending/ns2/example.com.db.in patch +dist/bind/bin/tests/system/pending/ns2/example.db.in patch +dist/bind/bin/tests/system/pending/ns2/forgery.db patch +dist/bind/bin/tests/system/pending/ns2/named.conf patch +dist/bind/bin/tests/system/pending/ns2/sign.sh patch +dist/bind/bin/tests/system/pending/ns3/hostile.db patch +dist/bind/bin/tests/system/pending/ns3/mail.example.db patch +dist/bind/bin/tests/system/pending/ns3/named.conf patch +dist/bind/bin/tests/system/pending/ns4/named.conf patch +dist/bind/bin/tests/system/pending/prereq.sh patch +dist/bind/bin/tests/system/pending/setup.sh patch +dist/bind/bin/tests/system/pending/tests.sh patch +dist/bind/doc/arm/Bv9ARM.pdf patch +dist/bind/doc/draft/draft-baba-dnsext-acl-reqts-01.txt delete +dist/bind/doc/draft/draft-daigle-napstr-04.txt delete +dist/bind/doc/draft/draft-danisch-dns-rr-smtp-03.txt delete +dist/bind/doc/draft/draft-dnsext-opcode-discover-02.txt delete +dist/bind/doc/draft/draft-durand-dnsop-dynreverse-00.txt delete +dist/bind/doc/draft/draft-ietf-6man-text-addr-representation-01.txt patch +dist/bind/doc/draft/draft-ietf-behave-dns64-01.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-2929bis-01.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-axfr-clarify-12.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-dns-tcp-requirements-01.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-09.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-experiments-03.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-gost-05.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-forgery-resilience-00.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-mdns-46.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-nsec3-12.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-nsid-01.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-07.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-07.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-rfc2671bis-edns0-02.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-rfc2672bis-dname-06.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-rfc2672bis-dname-18.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-rfc3597-bis-00.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-trustupdate-timers-05.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-tsig-md5-deprecated-03.txt patch +dist/bind/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt delete +dist/bind/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt delete
CVS commit: [netbsd-5-0] src/sys/dev/pci
Module Name:src Committed By: snj Date: Thu Jan 21 08:41:01 UTC 2010 Modified Files: src/sys/dev/pci [netbsd-5-0]: azalia.c Log Message: Pull up following revision(s) (requested by tonnerre in ticket #1258): sys/dev/pci/azalia.c: revision 1.72 Signedness bug/crash in azalia. Fixes PR 42604. By Pierre Pronchery. To generate a diff of this commit: cvs rdiff -u -r1.64.6.1 -r1.64.6.1.2.1 src/sys/dev/pci/azalia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/azalia.c diff -u src/sys/dev/pci/azalia.c:1.64.6.1 src/sys/dev/pci/azalia.c:1.64.6.1.2.1 --- src/sys/dev/pci/azalia.c:1.64.6.1 Mon Mar 2 19:53:26 2009 +++ src/sys/dev/pci/azalia.c Thu Jan 21 08:41:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: azalia.c,v 1.64.6.1 2009/03/02 19:53:26 snj Exp $ */ +/* $NetBSD: azalia.c,v 1.64.6.1.2.1 2010/01/21 08:41:00 snj Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: azalia.c,v 1.64.6.1 2009/03/02 19:53:26 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: azalia.c,v 1.64.6.1.2.1 2010/01/21 08:41:00 snj Exp $); #include sys/param.h #include sys/device.h @@ -2257,7 +2257,7 @@ az = v; co = az-codecs[az-codecno]; - if (mdev-index = co-nmixers) + if (mdev-index 0 || mdev-index = co-nmixers) return ENXIO; *mdev = co-mixers[mdev-index].devinfo; return 0;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Thu Jan 21 08:41:40 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1258. To generate a diff of this commit: cvs rdiff -u -r1.1.2.42 -r1.1.2.43 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.42 src/doc/CHANGES-5.0.2:1.1.2.43 --- src/doc/CHANGES-5.0.2:1.1.2.42 Wed Jan 20 05:36:59 2010 +++ src/doc/CHANGES-5.0.2 Thu Jan 21 08:41:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.42 2010/01/20 05:36:59 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.43 2010/01/21 08:41:39 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -968,3 +968,8 @@ prevents accidentally ending up in a short ARC4 cycle. [joerg, ticket #1253] +sys/dev/pci/azalia.c1.72 + + Signedness bug/crash in azalia. Fixes PR 42604. + [tonnerre, ticket #1258] +
CVS commit: [netbsd-5-0] src/sys/lib/libkern
Module Name:src Committed By: snj Date: Wed Jan 20 05:36:09 UTC 2010 Modified Files: src/sys/lib/libkern [netbsd-5-0]: arc4random.c Log Message: Pull up following revision(s) (requested by joerg in ticket #1253): sys/lib/libkern/arc4random.c: revision 1.21 Keep arc4_i and arc4_j synchronised after a rekeying. This prevents accidentally ending up in a short ARC4 cycle. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.16.1 src/sys/lib/libkern/arc4random.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arc4random.c diff -u src/sys/lib/libkern/arc4random.c:1.20 src/sys/lib/libkern/arc4random.c:1.20.16.1 --- src/sys/lib/libkern/arc4random.c:1.20 Mon Apr 28 20:24:06 2008 +++ src/sys/lib/libkern/arc4random.c Wed Jan 20 05:36:09 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: arc4random.c,v 1.20 2008/04/28 20:24:06 martin Exp $ */ +/* $NetBSD: arc4random.c,v 1.20.16.1 2010/01/20 05:36:09 snj Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -136,6 +136,7 @@ arc4_j = (arc4_j + arc4_sbox[n] + key[n]) % 256; arc4_swap(arc4_sbox[n], arc4_sbox[arc4_j]); } + arc4_i = arc4_j; /* Reset for next reseed cycle. */ arc4_nextreseed = time_uptime + ARC4_RESEED_SECONDS;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Wed Jan 20 05:36:59 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1253. To generate a diff of this commit: cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.41 src/doc/CHANGES-5.0.2:1.1.2.42 --- src/doc/CHANGES-5.0.2:1.1.2.41 Mon Jan 18 18:52:24 2010 +++ src/doc/CHANGES-5.0.2 Wed Jan 20 05:36:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.41 2010/01/18 18:52:24 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.42 2010/01/20 05:36:59 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -962,3 +962,9 @@ lock order assumptions. Per discussion with martin. [rmind, ticket #1241] +sys/lib/libkern/arc4random.c 1.21 + + Keep arc4_i and arc4_j synchronised after a rekeying. This + prevents accidentally ending up in a short ARC4 cycle. + [joerg, ticket #1253] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Mon Jan 18 18:52:25 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 CHANGES-5.0.2 Log Message: Move tickets 1238, 1240,1241 to the correct file. To generate a diff of this commit: cvs rdiff -u -r1.1.2.45 -r1.1.2.46 src/doc/CHANGES-5.0.1 cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.45 src/doc/CHANGES-5.0.1:1.1.2.46 --- src/doc/CHANGES-5.0.1:1.1.2.45 Sat Jan 16 17:54:33 2010 +++ src/doc/CHANGES-5.0.1 Mon Jan 18 18:52:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.45 2010/01/16 17:54:33 bouyer Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.46 2010/01/18 18:52:24 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -733,24 +733,3 @@ Welcome to 5.0.1! [snj] -sys/kern/kern_sig.c1.302 - - sigactsunshare(): set reference count in a case of new sigacts - allocation. - Bug (e.g. memory leak) can happen when using clone(2) call. - [rmind, ticket #1238] - -sys/kern/kern_runq.c1.28 - - sched_catchlwp: fix the case when other CPU might see - curlwp-l_cpu != curcpu() while LWP is finishing context switch. - Should fix PR/42539, tested by mar...@. - [rmind, ticket #1240] - -sys/kern/kern_softint.c1.30 - - softint_execute: release/re-acquire kernel-lock depending on - SOFTINT_MPSAFE flag. Keeping it held for MP-safe cases break the - lock order assumptions. Per discussion with martin. - [rmind, ticket #1241] - Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.40 src/doc/CHANGES-5.0.2:1.1.2.41 --- src/doc/CHANGES-5.0.2:1.1.2.40 Tue Jan 12 09:09:59 2010 +++ src/doc/CHANGES-5.0.2 Mon Jan 18 18:52:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.40 2010/01/12 09:09:59 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.41 2010/01/18 18:52:24 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -941,3 +941,24 @@ Disable OpenSSL renegotiation, thus avoiding CVE-2009-3555. [tonnerre, ticket #1237] +sys/kern/kern_sig.c1.302 + + sigactsunshare(): set reference count in a case of new sigacts + allocation. + Bug (e.g. memory leak) can happen when using clone(2) call. + [rmind, ticket #1238] + +sys/kern/kern_runq.c1.28 + + sched_catchlwp: fix the case when other CPU might see + curlwp-l_cpu != curcpu() while LWP is finishing context switch. + Should fix PR/42539, tested by mar...@. + [rmind, ticket #1240] + +sys/kern/kern_softint.c1.30 + + softint_execute: release/re-acquire kernel-lock depending on + SOFTINT_MPSAFE flag. Keeping it held for MP-safe cases break the + lock order assumptions. Per discussion with martin. + [rmind, ticket #1241] +
CVS commit: [netbsd-5-0] src/gnu/usr.bin/xcvs/cvsbug
Module Name:src
Committed By: bouyer
Date: Sat Jan 16 17:27:39 UTC 2010
Modified Files:
src/gnu/usr.bin/xcvs/cvsbug [netbsd-5-0]: Makefile
Log Message:
Apply patch, requested by snj in ticket #1215:
gnu/usr.bin/xcvs/cvsbug/Makefile: patch
Properly replace @MKTEMP_SH_FUNCTION@, @MKTEMP@, and @sendm...@.
Fixes PR bin/39629.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.6.1 src/gnu/usr.bin/xcvs/cvsbug/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/xcvs/cvsbug/Makefile
diff -u src/gnu/usr.bin/xcvs/cvsbug/Makefile:1.2 src/gnu/usr.bin/xcvs/cvsbug/Makefile:1.2.6.1
--- src/gnu/usr.bin/xcvs/cvsbug/Makefile:1.2 Sat Oct 25 22:27:35 2008
+++ src/gnu/usr.bin/xcvs/cvsbug/Makefile Sat Jan 16 17:27:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile,v 1.2.6.1 2010/01/16 17:27:38 bouyer Exp $
.include ${.CURDIR}/../Makefile.inc
@@ -12,7 +12,10 @@
cvsbug: cvsbug.in
${_MKTARGET_CREATE}
${TOOL_SED} -e 's,@PACKAGE_BUGREPORT@,bug-...@gnu.org,g' \
- -e s,@VERSION@,`cat .fname`,g ${.ALLSRC} ${.TARGET}
+ -e s,@VERSION@,`cat .fname`,g \
+ -e s,@MKTEMP_SH_FUNCTION@,, \
+ -e s,@MKTEMP@,/usr/bin/mktemp, \
+ -e s,@SENDMAIL@,/usr/sbin/sendmail, ${.ALLSRC} ${.TARGET}
chmod a+x ${.TARGET}
cvsbug: .fname
CVS commit: [netbsd-5-0] src/gnu/usr.bin/xcvs/cvsbug
Module Name:src
Committed By: bouyer
Date: Sat Jan 16 17:28:11 UTC 2010
Modified Files:
src/gnu/usr.bin/xcvs/cvsbug [netbsd-5-0]: Makefile
Log Message:
Revert previous, wrong branch
To generate a diff of this commit:
cvs rdiff -u -r1.2.6.1 -r1.2.6.2 src/gnu/usr.bin/xcvs/cvsbug/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/xcvs/cvsbug/Makefile
diff -u src/gnu/usr.bin/xcvs/cvsbug/Makefile:1.2.6.1 src/gnu/usr.bin/xcvs/cvsbug/Makefile:1.2.6.2
--- src/gnu/usr.bin/xcvs/cvsbug/Makefile:1.2.6.1 Sat Jan 16 17:27:38 2010
+++ src/gnu/usr.bin/xcvs/cvsbug/Makefile Sat Jan 16 17:28:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.6.1 2010/01/16 17:27:38 bouyer Exp $
+# $NetBSD: Makefile,v 1.2.6.2 2010/01/16 17:28:10 bouyer Exp $
.include ${.CURDIR}/../Makefile.inc
@@ -12,10 +12,7 @@
cvsbug: cvsbug.in
${_MKTARGET_CREATE}
${TOOL_SED} -e 's,@PACKAGE_BUGREPORT@,bug-...@gnu.org,g' \
- -e s,@VERSION@,`cat .fname`,g \
- -e s,@MKTEMP_SH_FUNCTION@,, \
- -e s,@MKTEMP@,/usr/bin/mktemp, \
- -e s,@SENDMAIL@,/usr/sbin/sendmail, ${.ALLSRC} ${.TARGET}
+ -e s,@VERSION@,`cat .fname`,g ${.ALLSRC} ${.TARGET}
chmod a+x ${.TARGET}
cvsbug: .fname
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Jan 16 17:32:46 UTC 2010
Modified Files:
src/sys/kern [netbsd-5-0]: kern_sig.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1238):
sys/kern/kern_sig.c: revision 1.302
sigactsunshare(): set reference count in a case of new sigacts allocation.
Bug (e.g. memory leak) can happen when using clone(2) call.
To generate a diff of this commit:
cvs rdiff -u -r1.289.4.5 -r1.289.4.5.2.1 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.289.4.5 src/sys/kern/kern_sig.c:1.289.4.5.2.1
--- src/sys/kern/kern_sig.c:1.289.4.5 Wed Apr 1 21:56:50 2009
+++ src/sys/kern/kern_sig.c Sat Jan 16 17:32:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.289.4.5 2009/04/01 21:56:50 snj Exp $ */
+/* $NetBSD: kern_sig.c,v 1.289.4.5.2.1 2010/01/16 17:32:45 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.5 2009/04/01 21:56:50 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.5.2.1 2010/01/16 17:32:45 bouyer Exp $);
#include opt_ptrace.h
#include opt_compat_sunos.h
@@ -200,24 +200,19 @@
struct sigacts *
sigactsinit(struct proc *pp, int share)
{
- struct sigacts *ps, *ps2;
+ struct sigacts *ps = pp-p_sigacts, *ps2;
- ps = pp-p_sigacts;
-
- if (share) {
+ if (__predict_false(share)) {
atomic_inc_uint(ps-sa_refcnt);
- ps2 = ps;
- } else {
- ps2 = pool_cache_get(sigacts_cache, PR_WAITOK);
- /* XXXAD get rid of this */
- mutex_init(ps2-sa_mutex, MUTEX_DEFAULT, IPL_SCHED);
- mutex_enter(ps-sa_mutex);
- memcpy(ps2-sa_sigdesc, ps-sa_sigdesc,
- sizeof(ps2-sa_sigdesc));
- mutex_exit(ps-sa_mutex);
- ps2-sa_refcnt = 1;
+ return ps;
}
+ ps2 = pool_cache_get(sigacts_cache, PR_WAITOK);
+ mutex_init(ps2-sa_mutex, MUTEX_DEFAULT, IPL_SCHED);
+ ps2-sa_refcnt = 1;
+ mutex_enter(ps-sa_mutex);
+ memcpy(ps2-sa_sigdesc, ps-sa_sigdesc, sizeof(ps2-sa_sigdesc));
+ mutex_exit(ps-sa_mutex);
return ps2;
}
@@ -230,15 +225,16 @@
void
sigactsunshare(struct proc *p)
{
- struct sigacts *ps, *oldps;
+ struct sigacts *ps, *oldps = p-p_sigacts;
- oldps = p-p_sigacts;
- if (oldps-sa_refcnt == 1)
+ if (__predict_true(oldps-sa_refcnt == 1))
return;
+
ps = pool_cache_get(sigacts_cache, PR_WAITOK);
- /* XXXAD get rid of this */
mutex_init(ps-sa_mutex, MUTEX_DEFAULT, IPL_SCHED);
- memset(ps-sa_sigdesc, 0, sizeof(ps-sa_sigdesc));
+ memset(ps-sa_sigdesc, 0, sizeof(ps-sa_sigdesc));
+ ps-sa_refcnt = 1;
+
p-p_sigacts = ps;
sigactsfree(oldps);
}
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Jan 16 17:39:07 UTC 2010
Modified Files:
src/sys/kern [netbsd-5-0]: kern_runq.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1240):
sys/kern/kern_runq.c: revision 1.28
sched_catchlwp: fix the case when other CPU might see curlwp-l_cpu != curcpu()
while LWP is finishing context switch. Should fix PR/42539, tested by mar...@.
To generate a diff of this commit:
cvs rdiff -u -r1.22.4.3 -r1.22.4.3.2.1 src/sys/kern/kern_runq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_runq.c
diff -u src/sys/kern/kern_runq.c:1.22.4.3 src/sys/kern/kern_runq.c:1.22.4.3.2.1
--- src/sys/kern/kern_runq.c:1.22.4.3 Mon Mar 2 19:51:01 2009
+++ src/sys/kern/kern_runq.c Sat Jan 16 17:39:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_runq.c,v 1.22.4.3 2009/03/02 19:51:01 snj Exp $ */
+/* $NetBSD: kern_runq.c,v 1.22.4.3.2.1 2010/01/16 17:39:07 bouyer Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius rmind at NetBSD org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_runq.c,v 1.22.4.3 2009/03/02 19:51:01 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_runq.c,v 1.22.4.3.2.1 2010/01/16 17:39:07 bouyer Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -482,6 +482,17 @@
/* Grab the thread, and move to the local run queue */
sched_dequeue(l);
+
+ /*
+ * If LWP is still context switching, we may need to
+ * spin-wait before changing its CPU.
+ */
+ if (__predict_false(l-l_ctxswtch != 0)) {
+ u_int count;
+ count = SPINLOCK_BACKOFF_MIN;
+ while (l-l_ctxswtch)
+SPINLOCK_BACKOFF(count);
+ }
l-l_cpu = curci;
ci_rq-r_ev_pull.ev_count++;
lwp_unlock_to(l, curspc-spc_mutex);
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Jan 16 17:41:07 UTC 2010
Modified Files:
src/sys/kern [netbsd-5-0]: kern_softint.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1241):
sys/kern/kern_softint.c: revision 1.30
softint_execute: release/re-acquire kernel-lock depending on SOFTINT_MPSAFE
flag. Keeping it held for MP-safe cases break the lock order assumptions.
Per discussion with martin.
To generate a diff of this commit:
cvs rdiff -u -r1.23.4.2 -r1.23.4.2.2.1 src/sys/kern/kern_softint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_softint.c
diff -u src/sys/kern/kern_softint.c:1.23.4.2 src/sys/kern/kern_softint.c:1.23.4.2.2.1
--- src/sys/kern/kern_softint.c:1.23.4.2 Mon Feb 2 03:40:11 2009
+++ src/sys/kern/kern_softint.c Sat Jan 16 17:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_softint.c,v 1.23.4.2 2009/02/02 03:40:11 snj Exp $ */
+/* $NetBSD: kern_softint.c,v 1.23.4.2.2.1 2010/01/16 17:41:07 bouyer Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -176,7 +176,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_softint.c,v 1.23.4.2 2009/02/02 03:40:11 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_softint.c,v 1.23.4.2.2.1 2010/01/16 17:41:07 bouyer Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -527,7 +527,12 @@
splx(s);
/* Run the handler. */
- if ((sh-sh_flags SOFTINT_MPSAFE) == 0 !havelock) {
+ if (sh-sh_flags SOFTINT_MPSAFE) {
+ if (havelock) {
+KERNEL_UNLOCK_ONE(l);
+havelock = false;
+ }
+ } else if (!havelock) {
KERNEL_LOCK(1, l);
havelock = true;
}
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Jan 16 17:54:33 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: tickets 1238, 1240,1241 To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-5.0.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.44 src/doc/CHANGES-5.0.1:1.1.2.45 --- src/doc/CHANGES-5.0.1:1.1.2.44 Wed Jul 29 22:35:18 2009 +++ src/doc/CHANGES-5.0.1 Sat Jan 16 17:54:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.44 2009/07/29 22:35:18 snj Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.45 2010/01/16 17:54:33 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -733,3 +733,24 @@ Welcome to 5.0.1! [snj] +sys/kern/kern_sig.c1.302 + + sigactsunshare(): set reference count in a case of new sigacts + allocation. + Bug (e.g. memory leak) can happen when using clone(2) call. + [rmind, ticket #1238] + +sys/kern/kern_runq.c1.28 + + sched_catchlwp: fix the case when other CPU might see + curlwp-l_cpu != curcpu() while LWP is finishing context switch. + Should fix PR/42539, tested by mar...@. + [rmind, ticket #1240] + +sys/kern/kern_softint.c1.30 + + softint_execute: release/re-acquire kernel-lock depending on + SOFTINT_MPSAFE flag. Keeping it held for MP-safe cases break the + lock order assumptions. Per discussion with martin. + [rmind, ticket #1241] +
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: snj
Date: Tue Jan 12 09:08:45 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-0]: s3_lib.c s3_pkt.c s3_srvr.c
ssl_locl.h
Log Message:
Apply patch (requested by tonnerre in ticket #1237):
Disable OpenSSL renegotiation, thus avoiding CVE-2009-3555.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.8.1 src/crypto/dist/openssl/ssl/s3_lib.c
cvs rdiff -u -r1.9.8.1 -r1.9.8.2 src/crypto/dist/openssl/ssl/s3_pkt.c
cvs rdiff -u -r1.15.4.1 -r1.15.4.1.2.1 src/crypto/dist/openssl/ssl/s3_srvr.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/crypto/dist/openssl/ssl/ssl_locl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/s3_lib.c
diff -u src/crypto/dist/openssl/ssl/s3_lib.c:1.14 src/crypto/dist/openssl/ssl/s3_lib.c:1.14.8.1
--- src/crypto/dist/openssl/ssl/s3_lib.c:1.14 Tue Jun 10 19:45:00 2008
+++ src/crypto/dist/openssl/ssl/s3_lib.c Tue Jan 12 09:08:44 2010
@@ -3289,6 +3289,9 @@
if (s-s3-flags SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
return(0);
+ if (!(s-s3-flags SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
+ return(0);
+
s-s3-renegotiate=1;
return(1);
}
Index: src/crypto/dist/openssl/ssl/s3_pkt.c
diff -u src/crypto/dist/openssl/ssl/s3_pkt.c:1.9.8.1 src/crypto/dist/openssl/ssl/s3_pkt.c:1.9.8.2
--- src/crypto/dist/openssl/ssl/s3_pkt.c:1.9.8.1 Sun Jul 5 00:31:20 2009
+++ src/crypto/dist/openssl/ssl/s3_pkt.c Tue Jan 12 09:08:45 2010
@@ -1041,6 +1041,7 @@
if (SSL_is_init_finished(s)
!(s-s3-flags SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
+ (s-s3-flags SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)
!s-s3-renegotiate)
{
ssl3_renegotiate(s);
@@ -1173,7 +1174,8 @@
if ((s-s3-handshake_fragment_len = 4) !s-in_handshake)
{
if (((s-stateSSL_ST_MASK) == SSL_ST_OK)
- !(s-s3-flags SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS))
+ !(s-s3-flags SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
+ (s-s3-flags SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
{
#if 0 /* worked only because C operator preferences are not as expected (and
* because this is not really needed for clients except for detecting
Index: src/crypto/dist/openssl/ssl/s3_srvr.c
diff -u src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1 src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1.2.1
--- src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1 Tue Jan 20 21:28:09 2009
+++ src/crypto/dist/openssl/ssl/s3_srvr.c Tue Jan 12 09:08:45 2010
@@ -763,6 +763,14 @@
#endif
STACK_OF(SSL_CIPHER) *ciphers=NULL;
+ if (s-new_session
+ !(s-s3-flagsSSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
+ {
+ al=SSL_AD_HANDSHAKE_FAILURE;
+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+ goto f_err;
+ }
+
/* We do this so that we will respond with our native type.
* If we are TLSv1 and we get SSLv3, we will respond with TLSv1,
* This down switching should be handled by a different method.
Index: src/crypto/dist/openssl/ssl/ssl_locl.h
diff -u src/crypto/dist/openssl/ssl/ssl_locl.h:1.13 src/crypto/dist/openssl/ssl/ssl_locl.h:1.13.8.1
--- src/crypto/dist/openssl/ssl/ssl_locl.h:1.13 Tue Jun 10 19:45:00 2008
+++ src/crypto/dist/openssl/ssl/ssl_locl.h Tue Jan 12 09:08:45 2010
@@ -450,6 +450,8 @@
#define NAMED_CURVE_TYPE 3
#endif /* OPENSSL_NO_EC */
+#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
+
typedef struct cert_pkey_st
{
X509 *x509;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Tue Jan 12 09:09:59 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1237. To generate a diff of this commit: cvs rdiff -u -r1.1.2.39 -r1.1.2.40 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.39 src/doc/CHANGES-5.0.2:1.1.2.40 --- src/doc/CHANGES-5.0.2:1.1.2.39 Sat Jan 9 02:04:18 2010 +++ src/doc/CHANGES-5.0.2 Tue Jan 12 09:09:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.39 2010/01/09 02:04:18 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.40 2010/01/12 09:09:59 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -933,3 +933,11 @@ Fixes PR/42498. [dsl, ticket #1208] +crypto/dist/openssl/ssl/s3_lib.c patch +crypto/dist/openssl/ssl/s3_pkt.c patch +crypto/dist/openssl/ssl/s3_srvr.c patch +crypto/dist/openssl/ssl/ssl_locl.h patch + + Disable OpenSSL renegotiation, thus avoiding CVE-2009-3555. + [tonnerre, ticket #1237] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: snj
Date: Sat Jan 9 01:10:53 UTC 2010
Modified Files:
src/sys/kern [netbsd-5-0]: kern_event.c
Log Message:
Pull up following revision(s) (requested by dsl in ticket #1208):
sys/kern/kern_event.c: revision 1.69
Use sizeof correct type, not pointer to wrong type.
Fixes PR/42498.
This has been wrong since the initial import!
To generate a diff of this commit:
cvs rdiff -u -r1.60.6.1 -r1.60.6.1.2.1 src/sys/kern/kern_event.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.60.6.1 src/sys/kern/kern_event.c:1.60.6.1.2.1
--- src/sys/kern/kern_event.c:1.60.6.1 Sat Apr 4 23:36:27 2009
+++ src/sys/kern/kern_event.c Sat Jan 9 01:10:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.60.6.1 2009/04/04 23:36:27 snj Exp $ */
+/* $NetBSD: kern_event.c,v 1.60.6.1.2.1 2010/01/09 01:10:52 snj Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.60.6.1 2009/04/04 23:36:27 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.60.6.1.2.1 2010/01/09 01:10:52 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -291,7 +291,7 @@
if (user_kfilterc + 1 user_kfiltermaxc) {
/* Grow in KFILTER_EXTENT chunks. */
user_kfiltermaxc += KFILTER_EXTENT;
- len = user_kfiltermaxc * sizeof(struct filter *);
+ len = user_kfiltermaxc * sizeof(*kfilter);
kfilter = kmem_alloc(len, KM_SLEEP);
memset((char *)kfilter + user_kfiltersz, 0, len - user_kfiltersz);
if (user_kfilters != NULL) {
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sat Jan 9 02:04:18 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1208. To generate a diff of this commit: cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.38 src/doc/CHANGES-5.0.2:1.1.2.39 --- src/doc/CHANGES-5.0.2:1.1.2.38 Thu Jan 7 07:49:31 2010 +++ src/doc/CHANGES-5.0.2 Sat Jan 9 02:04:18 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.38 2010/01/07 07:49:31 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.39 2010/01/09 02:04:18 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -927,3 +927,9 @@ Don't include grp.h Fixes cross-build under Mac OS X 10.6. [tron, ticket #1202] +sys/kern/kern_event.c1.69 + + Use sizeof correct type, not pointer to wrong type. + Fixes PR/42498. + [dsl, ticket #1208] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: snj
Date: Thu Jan 7 07:08:34 UTC 2010
Modified Files:
src/sys/kern [netbsd-5-0]: sys_sig.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1199):
sys/kern/sys_sig.c: revision 1.24
sigtimedwait: fix a memory leak (which happens since newlock2 times).
Allocate ksiginfo on stack since it is safe and sigget() assumes that it is
not allocated from pool (pending signals via sigput()/sigget() mill should
be dynamically allocated, however). Might be useful to revisit later.
Likely the cause of PR/40750 and indirect cause of PR/39283.
To generate a diff of this commit:
cvs rdiff -u -r1.17.4.2 -r1.17.4.2.2.1 src/sys/kern/sys_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_sig.c
diff -u src/sys/kern/sys_sig.c:1.17.4.2 src/sys/kern/sys_sig.c:1.17.4.2.2.1
--- src/sys/kern/sys_sig.c:1.17.4.2 Wed Apr 1 21:43:53 2009
+++ src/sys/kern/sys_sig.c Thu Jan 7 07:08:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_sig.c,v 1.17.4.2 2009/04/01 21:43:53 snj Exp $ */
+/* $NetBSD: sys_sig.c,v 1.17.4.2.2.1 2010/01/07 07:08:34 snj Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.17.4.2 2009/04/01 21:43:53 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.17.4.2.2.1 2010/01/07 07:08:34 snj Exp $);
#include opt_ptrace.h
#include opt_compat_netbsd.h
@@ -622,7 +622,7 @@
int error, signum;
int timo = 0;
struct timespec ts, tsstart, tsnow;
- ksiginfo_t *ksi;
+ ksiginfo_t ksi;
memset(tsstart, 0, sizeof tsstart); /* XXX gcc */
@@ -660,13 +660,6 @@
*/
sigminusset(sigcantmask, l-l_sigwaitset);
- /*
- * Allocate a ksi up front. We can't sleep with the mutex held.
- */
- ksi = ksiginfo_alloc(p, NULL, PR_WAITOK);
- if (ksi == NULL)
- return (ENOMEM);
-
mutex_enter(p-p_lock);
/*
@@ -678,8 +671,8 @@
goto out;
}
- if ((signum = sigget(p-p_sigpend, ksi, 0, l-l_sigwaitset)) == 0)
- signum = sigget(l-l_sigpend, ksi, 0, l-l_sigwaitset);
+ if ((signum = sigget(p-p_sigpend, ksi, 0, l-l_sigwaitset)) == 0)
+ signum = sigget(l-l_sigpend, ksi, 0, l-l_sigwaitset);
if (signum != 0) {
/*
@@ -692,7 +685,7 @@
/*
* Set up the sigwait list.
*/
- l-l_sigwaited = ksi;
+ l-l_sigwaited = ksi;
LIST_INSERT_HEAD(p-p_sigwaiters, l, l_sigwaiter);
/*
@@ -747,10 +740,8 @@
*/
out:
if (error == 0)
- error = (*put_info)(ksi-ksi_info, SCARG(uap, info),
- sizeof(ksi-ksi_info));
-
- ksiginfo_free(ksi);
+ error = (*put_info)(ksi.ksi_info, SCARG(uap, info),
+ sizeof(ksi.ksi_info));
return error;
}
CVS commit: [netbsd-5-0] src/tools/compat
Module Name:src Committed By: snj Date: Thu Jan 7 07:45:01 UTC 2010 Modified Files: src/tools/compat [netbsd-5-0]: compat_defs.h Log Message: Apply patch (requested by tron in ticket #1202): Don't include grp.h Fixes cross-build under Mac OS X 10.6. To generate a diff of this commit: cvs rdiff -u -r1.67.2.1 -r1.67.2.1.2.1 src/tools/compat/compat_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/compat_defs.h diff -u src/tools/compat/compat_defs.h:1.67.2.1 src/tools/compat/compat_defs.h:1.67.2.1.2.1 --- src/tools/compat/compat_defs.h:1.67.2.1 Thu Jan 15 04:32:35 2009 +++ src/tools/compat/compat_defs.h Thu Jan 7 07:45:01 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_defs.h,v 1.67.2.1 2009/01/15 04:32:35 snj Exp $ */ +/* $NetBSD: compat_defs.h,v 1.67.2.1.2.1 2010/01/07 07:45:01 snj Exp $ */ #ifndef __NETBSD_COMPAT_DEFS_H__ #define __NETBSD_COMPAT_DEFS_H__ @@ -38,7 +38,6 @@ #include sys/stat.h #include errno.h #include fcntl.h -#include grp.h #include limits.h #include paths.h #include stdarg.h @@ -76,6 +75,9 @@ /* We don't include pwd.h here, so that compat_pwd.h works. */ struct passwd; +/* We don't include grp.h here, so that compat_pwd.h works. */ +struct group; + /* Assume an ANSI compiler for the host. */ #undef __P
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Thu Jan 7 07:49:31 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Tickets 1199 and 1202. To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.37 src/doc/CHANGES-5.0.2:1.1.2.38 --- src/doc/CHANGES-5.0.2:1.1.2.37 Sun Jan 3 19:34:29 2010 +++ src/doc/CHANGES-5.0.2 Thu Jan 7 07:49:31 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.37 2010/01/03 19:34:29 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.38 2010/01/07 07:49:31 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -916,3 +916,14 @@ but make sure that it is not smaller than minimum acceptable value. [plunky, ticket #1221] +sys/kern/sys_sig.c1.24 + + sigtimedwait: fix a memory leak. Likely the cause of PR/40750 and + indirect cause of PR/39283. + [rmind, ticket #1199] + +tools/compat/compat_defs.h patch + + Don't include grp.h Fixes cross-build under Mac OS X 10.6. + [tron, ticket #1202] +
CVS commit: [netbsd-5-0] src/sys/netbt
Module Name:src
Committed By: jdc
Date: Sun Jan 3 17:52:17 UTC 2010
Modified Files:
src/sys/netbt [netbsd-5-0]: rfcomm_session.c
Log Message:
Pull up revision 1.16 (requested by plunky in ticket #1221).
when receiving a MCC PN response, the max frame size that the remote
party requests must be less than the one we asked for which will not
be greater than the max acceptable value so no need to test for that
but make sure that it is not smaller than minimum acceptable value.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.10.1 src/sys/netbt/rfcomm_session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netbt/rfcomm_session.c
diff -u src/sys/netbt/rfcomm_session.c:1.14 src/sys/netbt/rfcomm_session.c:1.14.10.1
--- src/sys/netbt/rfcomm_session.c:1.14 Wed Aug 6 15:01:24 2008
+++ src/sys/netbt/rfcomm_session.c Sun Jan 3 17:52:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rfcomm_session.c,v 1.14 2008/08/06 15:01:24 plunky Exp $ */
+/* $NetBSD: rfcomm_session.c,v 1.14.10.1 2010/01/03 17:52:17 jdc Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rfcomm_session.c,v 1.14 2008/08/06 15:01:24 plunky Exp $);
+__KERNEL_RCSID(0, $NetBSD: rfcomm_session.c,v 1.14.10.1 2010/01/03 17:52:17 jdc Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -1365,7 +1365,8 @@
callout_stop(dlc-rd_timeout);
- if (pn.mtu RFCOMM_MTU_MAX || pn.mtu dlc-rd_mtu) {
+ /* reject invalid or unacceptable MTU */
+ if (pn.mtu RFCOMM_MTU_MIN || pn.mtu dlc-rd_mtu) {
dlc-rd_state = RFCOMM_DLC_WAIT_DISCONNECT;
err = rfcomm_session_send_frame(rs, RFCOMM_FRAME_DISC,
pn.dlci);
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: jdc Date: Sun Jan 3 17:53:30 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket #1221. To generate a diff of this commit: cvs rdiff -u -r1.1.2.35 -r1.1.2.36 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.35 src/doc/CHANGES-5.0.2:1.1.2.36 --- src/doc/CHANGES-5.0.2:1.1.2.35 Sat Jan 2 06:40:03 2010 +++ src/doc/CHANGES-5.0.2 Sun Jan 3 17:53:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.35 2010/01/02 06:40:03 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.36 2010/01/03 17:53:30 jdc Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -908,3 +908,11 @@ while booting from arccd-5.0.1.iso as described in PR bin/42410. [tsutsui, ticket #1198] +sys/netbt/rfcomm_session.c 1.16 + when receiving a MCC PN response, the max frame size that the remote + party requests must be less than the one we asked for which will not + be greater than the max acceptable value so no need to test for that + but make sure that it is not smaller than minimum acceptable value. + + [plunky, ticket #1221] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sun Jan 3 19:34:29 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Fix formatting. To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.36 src/doc/CHANGES-5.0.2:1.1.2.37 --- src/doc/CHANGES-5.0.2:1.1.2.36 Sun Jan 3 17:53:30 2010 +++ src/doc/CHANGES-5.0.2 Sun Jan 3 19:34:29 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.36 2010/01/03 17:53:30 jdc Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.37 2010/01/03 19:34:29 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -909,10 +909,10 @@ [tsutsui, ticket #1198] sys/netbt/rfcomm_session.c 1.16 - when receiving a MCC PN response, the max frame size that the remote + + When receiving a MCC PN response, the max frame size that the remote party requests must be less than the one we asked for which will not be greater than the max acceptable value so no need to test for that but make sure that it is not smaller than minimum acceptable value. - [plunky, ticket #1221]
CVS commit: [netbsd-5-0] src/usr.sbin/makefs/cd9660
Module Name:src Committed By: snj Date: Sat Jan 2 06:26:11 UTC 2010 Modified Files: src/usr.sbin/makefs/cd9660 [netbsd-5-0]: iso9660_rrip.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1198): usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.5 When splitting a System Use Area between a System Use field and a Continuation Area, be sure to insert the CE record at the correct point in the chain of SUSP records. Without this, makefs emits an invalid image if any file needs a Continuation Area. The bug seems to have been introduced with the conversion to TAILQs. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.20.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.c diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.1 --- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4 Mon Dec 18 21:03:29 2006 +++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c Sat Jan 2 06:26:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: iso9660_rrip.c,v 1.4 2006/12/18 21:03:29 christos Exp $ */ +/* $NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -43,7 +43,7 @@ #include sys/cdefs.h #if defined(__RCSID) !defined(__lint) -__RCSID($NetBSD: iso9660_rrip.c,v 1.4 2006/12/18 21:03:29 christos Exp $); +__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $); #endif /* !__lint */ static void cd9660_rrip_initialize_inode(cd9660node *); @@ -228,7 +228,7 @@ SUSP_ENTRY_SUSP_CE, CE, SUSP_LOC_ENTRY); cd9660_susp_ce(CE, node); /* This will automatically insert at the appropriate location */ - TAILQ_INSERT_TAIL(node-head, CE, rr_ll); + TAILQ_INSERT_AFTER(node-head, last, CE, rr_ll); susp_used += 28; /* Count how much CA data is necessary */
CVS commit: [netbsd-5-0] src/usr.sbin/makefs/cd9660
Module Name:src
Committed By: snj
Date: Sat Jan 2 06:27:27 UTC 2010
Modified Files:
src/usr.sbin/makefs/cd9660 [netbsd-5-0]: iso9660_rrip.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.6
Fix another bug in SUSP CE handling: when the SUSP records fit into
the System Use field with fewer then 28 bytes to spare, we were
remembering the wrong length for the System Use field and hence
emitting a corrupt directory entry. This could be triggered by trying
to build a filesystem containing a regular file with a 120-byte name.
Now we're a little more careful.
To generate a diff of this commit:
cvs rdiff -u -r1.4.20.1 -r1.4.20.2 src/usr.sbin/makefs/cd9660/iso9660_rrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.2
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.1 Sat Jan 2 06:26:11 2010
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c Sat Jan 2 06:27:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $ */
+/* $NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $);
#endif /* !__lint */
static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -200,7 +200,7 @@
static int
cd9660_susp_handle_continuation_common(cd9660node *node, int space)
{
- int ca_used, susp_used, working;
+ int ca_used, susp_used, susp_used_last, working;
struct ISO_SUSP_ATTRIBUTES *temp, *last = NULL, *CE;
working = 254 - space;
@@ -216,9 +216,15 @@
* CD9660_SUSP_ENTRY_SIZE(temp));
*/
working -= CD9660_SUSP_ENTRY_SIZE(temp);
+ if (working = 0)
+ susp_used += CD9660_SUSP_ENTRY_SIZE(temp);
if (working = 28) {
+ /*
+ * Remember the last entry after which we
+ * could insert a CE entry.
+ */
last = temp;
- susp_used += CD9660_SUSP_ENTRY_SIZE(temp);
+ susp_used_last = susp_used;
}
}
@@ -229,7 +235,7 @@
cd9660_susp_ce(CE, node);
/* This will automatically insert at the appropriate location */
TAILQ_INSERT_AFTER(node-head, last, CE, rr_ll);
- susp_used += 28;
+ susp_used = susp_used_last + 28;
/* Count how much CA data is necessary */
for (temp = TAILQ_NEXT(CE, rr_ll); temp != NULL;
CVS commit: [netbsd-5-0] src/usr.sbin/makefs/cd9660
Module Name:src
Committed By: snj
Date: Sat Jan 2 06:28:27 UTC 2010
Modified Files:
src/usr.sbin/makefs/cd9660 [netbsd-5-0]: iso9660_rrip.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.7
Initialize a local variable to get rid of a may be used uninitialized
warning (turned into error by -Werror).
To generate a diff of this commit:
cvs rdiff -u -r1.4.20.2 -r1.4.20.3 src/usr.sbin/makefs/cd9660/iso9660_rrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.2 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.3
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.2 Sat Jan 2 06:27:27 2010
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c Sat Jan 2 06:28:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $ */
+/* $NetBSD: iso9660_rrip.c,v 1.4.20.3 2010/01/02 06:28:26 snj Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.3 2010/01/02 06:28:26 snj Exp $);
#endif /* !__lint */
static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -200,7 +200,7 @@
static int
cd9660_susp_handle_continuation_common(cd9660node *node, int space)
{
- int ca_used, susp_used, susp_used_last, working;
+ int ca_used, susp_used, susp_used_last = 0, working;
struct ISO_SUSP_ATTRIBUTES *temp, *last = NULL, *CE;
working = 254 - space;
CVS commit: [netbsd-5-0] src/usr.sbin/makefs
Module Name:src
Committed By: snj
Date: Sat Jan 2 06:34:15 UTC 2010
Modified Files:
src/usr.sbin/makefs [netbsd-5-0]: cd9660.c cd9660.h
src/usr.sbin/makefs/cd9660 [netbsd-5-0]: cd9660_write.c iso9660_rrip.c
iso9660_rrip.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660.c: revision 1.25 via patch
usr.sbin/makefs/cd9660.h: revision 1.13 via patch
usr.sbin/makefs/cd9660/cd9660_write.c: revision 1.10
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.8
usr.sbin/makefs/cd9660/iso9660_rrip.h: revision 1.5
Add support for encoding RISC OS metadata into ISO 9660 filesystems.
This is done by adding the general ability to stuff non-SUSP data into
the end of the System Use field of a Directory Record, which required
some amount of rewriting of the SUSP support. I think the result is
at least as good as what came before, and I've fixed at least one bug
along the way. Tested against RISC OS 3.70 on my Risc PC.
Oh, why do we want it? It should allow us to make acorn{26,32} CDs that
can be booted directly from RISC OS without mucking around copying the
bootloader to a native filing system.
To generate a diff of this commit:
cvs rdiff -u -r1.22.2.1 -r1.22.2.1.2.1 src/usr.sbin/makefs/cd9660.c
cvs rdiff -u -r1.12 -r1.12.6.1 src/usr.sbin/makefs/cd9660.h
cvs rdiff -u -r1.9 -r1.9.6.1 src/usr.sbin/makefs/cd9660/cd9660_write.c
cvs rdiff -u -r1.4.20.3 -r1.4.20.4 src/usr.sbin/makefs/cd9660/iso9660_rrip.c
cvs rdiff -u -r1.4 -r1.4.28.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.22.2.1 src/usr.sbin/makefs/cd9660.c:1.22.2.1.2.1
--- src/usr.sbin/makefs/cd9660.c:1.22.2.1 Mon Feb 2 03:32:34 2009
+++ src/usr.sbin/makefs/cd9660.c Sat Jan 2 06:34:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.22.2.1 2009/02/02 03:32:34 snj Exp $ */
+/* $NetBSD: cd9660.c,v 1.22.2.1.2.1 2010/01/02 06:34:15 snj Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: cd9660.c,v 1.22.2.1 2009/02/02 03:32:34 snj Exp $);
+__RCSID($NetBSD: cd9660.c,v 1.22.2.1.2.1 2010/01/02 06:34:15 snj Exp $);
#endif /* !__lint */
#include string.h
@@ -187,6 +187,7 @@
temp-isoDirRecord = NULL;
temp-isoExtAttributes = NULL;
temp-rr_real_parent = temp-rr_relocated = NULL;
+ temp-su_tail_data = NULL;
return temp;
}
@@ -1759,6 +1760,9 @@
if (diskStructure.rock_ridge_enabled)
size += node-susp_entry_size;
+ size += node-su_tail_size;
+ size += size 1; /* Ensure length of record is even. */
+ assert(size = 254);
return size;
}
Index: src/usr.sbin/makefs/cd9660.h
diff -u src/usr.sbin/makefs/cd9660.h:1.12 src/usr.sbin/makefs/cd9660.h:1.12.6.1
--- src/usr.sbin/makefs/cd9660.h:1.12 Sun Jul 27 10:29:32 2008
+++ src/usr.sbin/makefs/cd9660.h Sat Jan 2 06:34:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.h,v 1.12 2008/07/27 10:29:32 reinoud Exp $ */
+/* $NetBSD: cd9660.h,v 1.12.6.1 2010/01/02 06:34:15 snj Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -208,6 +208,10 @@
int susp_dot_ce_length;
int susp_dot_dot_ce_length;
+ /* Data to put at the end of the System Use field */
+ int su_tail_size;
+ char *su_tail_data;
+
/*** PATH TABLE STUFF ***/
int level; /*depth*/
int ptnumber;
Index: src/usr.sbin/makefs/cd9660/cd9660_write.c
diff -u src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9 src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9.6.1
--- src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9 Sat May 10 19:00:07 2008
+++ src/usr.sbin/makefs/cd9660/cd9660_write.c Sat Jan 2 06:34:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_write.c,v 1.9 2008/05/10 19:00:07 skrll Exp $ */
+/* $NetBSD: cd9660_write.c,v 1.9.6.1 2010/01/02 06:34:15 snj Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: cd9660_write.c,v 1.9 2008/05/10 19:00:07 skrll Exp $);
+__RCSID($NetBSD: cd9660_write.c,v 1.9.6.1 2010/01/02 06:34:15 snj Exp $);
#endif /* !__lint */
static int cd9660_write_volume_descriptors(FILE *);
@@ -48,7 +48,7 @@
#if 0
static int cd9660_write_buffered(FILE *, int, int, const unsigned char*);
#endif
-static int cd9660_write_rr(FILE *, cd9660node *, int, int);
+static void cd9660_write_rr(FILE *, cd9660node *, int, int);
/*
* Write the image
@@ -271,7 +271,7 @@
int written;
iso_directory_record_cd9660 temp_record;
cd9660node *temp;
- int ca = 0, rv = 0;
+ int rv = 0;
/* Todo : clean up variables */
@@ -343,31 +343,27 @@
working_sector * diskStructure.sectorSize,
SEEK_SET);
}
-
-
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sat Jan 2 06:40:03 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1198. To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.34 src/doc/CHANGES-5.0.2:1.1.2.35 --- src/doc/CHANGES-5.0.2:1.1.2.34 Mon Dec 21 09:42:08 2009 +++ src/doc/CHANGES-5.0.2 Sat Jan 2 06:40:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.34 2009/12/21 09:42:08 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.35 2010/01/02 06:40:03 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -897,3 +897,14 @@ completely separate userspace VA. [martin, ticket #1200] +usr.sbin/makefs/cd9660.c 1.25 via patch +usr.sbin/makefs/cd9660.h 1.13 via patch +usr.sbin/makefs/cd9660/cd9660_write.c 1.10 +usr.sbin/makefs/cd9660/iso9660_rrip.c 1.5-1.8 +usr.sbin/makefs/cd9660/iso9660_rrip.h 1.5 + + Keep makefs(8) from creating invalid ISO format on rockridge support + which causes fatal errors in ARC BIOS firmware on MIPS Magnum R4000 + while booting from arccd-5.0.1.iso as described in PR bin/42410. + [tsutsui, ticket #1198] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Mon Dec 21 09:42:08 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1200 To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.33 src/doc/CHANGES-5.0.2:1.1.2.34 --- src/doc/CHANGES-5.0.2:1.1.2.33 Fri Dec 18 05:34:18 2009 +++ src/doc/CHANGES-5.0.2 Mon Dec 21 09:42:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.33 2009/12/18 05:34:18 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.34 2009/12/21 09:42:08 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -890,3 +890,10 @@ defaults to 16*mq_def_maxmsg [tron, ticket #1188] +sys/kern/vfs_syscalls.c1.400 + + Use the kernel space version of the vfs name, not the + original userspace pointer. Avoids crashes on archs with + completely separate userspace VA. + [martin, ticket #1200] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: snj
Date: Fri Dec 18 05:27:56 UTC 2009
Modified Files:
src/sys/kern [netbsd-5-0]: sys_mqueue.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #1188):
sys/kern/sys_mqueue.c: revision 1.28 via patch
fix some security critical bugs:
-an invalid signal number passed to mq_notify(2) could crash the kernel
on delivery -- add a boundary check
-a user could set mq_maxmsg (the maximal number of messages in a queue)
to a huge value on mq_open(O_CREAT) and later use up all kernel
memory by mq_send(2) -- add a sysctl'able limit which defaults
to 16*mq_def_maxmsg
(mq_notify(2) should get some more checks, and SIGEV_* values other
than SIGEV_SIGNAL should be handled somehow, but this doesn't look
security critical)
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1.2.3 -r1.12.4.1.2.4 src/sys/kern/sys_mqueue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_mqueue.c
diff -u src/sys/kern/sys_mqueue.c:1.12.4.1.2.3 src/sys/kern/sys_mqueue.c:1.12.4.1.2.4
--- src/sys/kern/sys_mqueue.c:1.12.4.1.2.3 Tue Jul 21 00:21:21 2009
+++ src/sys/kern/sys_mqueue.c Fri Dec 18 05:27:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_mqueue.c,v 1.12.4.1.2.3 2009/07/21 00:21:21 snj Exp $ */
+/* $NetBSD: sys_mqueue.c,v 1.12.4.1.2.4 2009/12/18 05:27:56 snj Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius rmind at NetBSD org
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_mqueue.c,v 1.12.4.1.2.3 2009/07/21 00:21:21 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_mqueue.c,v 1.12.4.1.2.4 2009/12/18 05:27:56 snj Exp $);
#include sys/param.h
#include sys/types.h
@@ -77,6 +77,7 @@
static u_int mq_max_msgsize = 16 * MQ_DEF_MSGSIZE;
static u_int mq_def_maxmsg = 32;
+static u_int mq_max_maxmsg = 16 * 32;
static kmutex_t mqlist_mtx;
static pool_cache_t mqmsg_cache;
@@ -330,7 +331,9 @@
kmem_free(name, MQ_NAMELEN);
return error;
}
- if (attr.mq_maxmsg = 0 || attr.mq_msgsize = 0 ||
+ if (attr.mq_maxmsg = 0 ||
+ attr.mq_maxmsg mq_max_maxmsg ||
+ attr.mq_msgsize = 0 ||
attr.mq_msgsize mq_max_msgsize) {
kmem_free(name, MQ_NAMELEN);
return EINVAL;
@@ -688,7 +691,8 @@
/* Check for the notify */
if (mq-mq_attrib.mq_curmsgs == 0 mq-mq_notify_proc
- (mq-mq_attrib.mq_flags MQ_RECEIVE) == 0) {
+ (mq-mq_attrib.mq_flags MQ_RECEIVE) == 0
+ mq-mq_sig_notify.sigev_notify == SIGEV_SIGNAL) {
/* Initialize the signal */
KSI_INIT(ksi);
ksi.ksi_signo = mq-mq_sig_notify.sigev_signo;
@@ -780,6 +784,9 @@
sizeof(struct sigevent));
if (error)
return error;
+ if (sig.sigev_notify == SIGEV_SIGNAL
+ (sig.sigev_signo =0 || sig.sigev_signo = NSIG))
+ return EINVAL;
}
error = mqueue_get(SCARG(uap, mqdes), fp);
@@ -1002,6 +1009,12 @@
SYSCTL_DESCR(Default maximal message count),
NULL, 0, mq_def_maxmsg, 0,
CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, node, NULL,
+ CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
+ CTLTYPE_INT, mq_max_maxmsg,
+ SYSCTL_DESCR(Maximal allowed message count),
+ NULL, 0, mq_max_maxmsg, 0,
+ CTL_CREATE, CTL_EOL);
}
/*
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Fri Dec 18 05:34:18 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1188. To generate a diff of this commit: cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.32 src/doc/CHANGES-5.0.2:1.1.2.33 --- src/doc/CHANGES-5.0.2:1.1.2.32 Thu Dec 10 23:13:45 2009 +++ src/doc/CHANGES-5.0.2 Fri Dec 18 05:34:18 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.32 2009/12/10 23:13:45 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.33 2009/12/18 05:34:18 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -879,3 +879,14 @@ array. [drochner, ticket #1189] +sys/kern/sys_mqueue.c1.28 + + Fix some security critical bugs: + - An invalid signal number passed to mq_notify(2) could crash the + kernel on delivery -- add a boundary check + - A user could set mq_maxmsg (the maximal number of messages in a + queue) to a huge value on mq_open(O_CREAT) and later use up all + kernel memory by mq_send(2) -- add a sysctl'able limit which + defaults to 16*mq_def_maxmsg + [tron, ticket #1188] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: snj
Date: Thu Dec 10 23:12:18 UTC 2009
Modified Files:
src/sys/kern [netbsd-5-0]: kern_time.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1189):
sys/kern/kern_time.c: revision 1.163
If a struct sigevent with SIGEV_SIGNAL is passed to timer_create(2),
check the signal number to be in the allowed range. An invalid
signal number could crash the kernel by overflowing the sigset_t
array.
More checks would be good, and SIGEV_THREAD shouldn't be dropped
silently, but this fixes at least the local DOS vulnerability.
To generate a diff of this commit:
cvs rdiff -u -r1.155.4.2 -r1.155.4.2.2.1 src/sys/kern/kern_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_time.c
diff -u src/sys/kern/kern_time.c:1.155.4.2 src/sys/kern/kern_time.c:1.155.4.2.2.1
--- src/sys/kern/kern_time.c:1.155.4.2 Sun Feb 8 20:38:49 2009
+++ src/sys/kern/kern_time.c Thu Dec 10 23:12:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.155.4.2 2009/02/08 20:38:49 snj Exp $ */
+/* $NetBSD: kern_time.c,v 1.155.4.2.2.1 2009/12/10 23:12:18 snj Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_time.c,v 1.155.4.2 2009/02/08 20:38:49 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_time.c,v 1.155.4.2.2.1 2009/12/10 23:12:18 snj Exp $);
#include sys/param.h
#include sys/resourcevar.h
@@ -536,7 +536,10 @@
if (((error =
(*fetch_event)(evp, pt-pt_ev, sizeof(pt-pt_ev))) != 0) ||
((pt-pt_ev.sigev_notify SIGEV_NONE) ||
- (pt-pt_ev.sigev_notify SIGEV_SA))) {
+ (pt-pt_ev.sigev_notify SIGEV_SA)) ||
+ (pt-pt_ev.sigev_notify == SIGEV_SIGNAL
+ (pt-pt_ev.sigev_signo = 0 ||
+ pt-pt_ev.sigev_signo = NSIG))) {
pool_put(ptimer_pool, pt);
return (error ? error : EINVAL);
}
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Thu Dec 10 23:13:45 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1189. To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.31 src/doc/CHANGES-5.0.2:1.1.2.32 --- src/doc/CHANGES-5.0.2:1.1.2.31 Wed Dec 9 04:47:29 2009 +++ src/doc/CHANGES-5.0.2 Thu Dec 10 23:13:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.31 2009/12/09 04:47:29 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.32 2009/12/10 23:13:45 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -871,3 +871,11 @@ Fix CVE-2009-3563. [kardel, ticket #1185] +sys/kern/kern_time.c1.163 + + If a struct sigevent with SIGEV_SIGNAL is passed to timer_create(2), + check the signal number to be in the allowed range. An invalid + signal number could crash the kernel by overflowing the sigset_t + array. + [drochner, ticket #1189] +
CVS commit: [netbsd-5-0] src/dist/ntp/ntpd
Module Name:src
Committed By: snj
Date: Wed Dec 9 04:45:48 UTC 2009
Modified Files:
src/dist/ntp/ntpd [netbsd-5-0]: ntp_request.c
Log Message:
Apply patch (requested by kardel in ticket 1185):
Fix CVE-2009-3563.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.8.1 src/dist/ntp/ntpd/ntp_request.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/ntp/ntpd/ntp_request.c
diff -u src/dist/ntp/ntpd/ntp_request.c:1.8 src/dist/ntp/ntpd/ntp_request.c:1.8.8.1
--- src/dist/ntp/ntpd/ntp_request.c:1.8 Sat Aug 23 09:10:31 2008
+++ src/dist/ntp/ntpd/ntp_request.c Wed Dec 9 04:45:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_request.c,v 1.8 2008/08/23 09:10:31 kardel Exp $ */
+/* $NetBSD: ntp_request.c,v 1.8.8.1 2009/12/09 04:45:48 snj Exp $ */
/*
* ntp_request.c - respond to information requests
@@ -411,6 +411,7 @@
int mod_okay
)
{
+ static u_long quiet_until;
struct req_pkt *inpkt;
struct req_pkt_tail *tailinpkt;
struct sockaddr_storage *srcadr;
@@ -446,8 +447,14 @@
|| (++ec, INFO_MBZ(inpkt-mbz_itemsize) != 0)
|| (++ec, rbufp-recv_length REQ_LEN_HDR)
) {
- msyslog(LOG_ERR, process_private: INFO_ERR_FMT: test %d failed, pkt from %s, ec, stoa(srcadr));
- req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
+ NLOG(NLOG_SYSEVENT)
+ if (current_time = quiet_until) {
+msyslog(LOG_ERR,
+ process_private: drop test %d
+ failed, pkt from %s,
+ ec, stoa(srcadr));
+quiet_until = current_time + 60;
+ }
return;
}
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Wed Dec 9 04:47:29 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1185. To generate a diff of this commit: cvs rdiff -u -r1.1.2.30 -r1.1.2.31 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.30 src/doc/CHANGES-5.0.2:1.1.2.31 --- src/doc/CHANGES-5.0.2:1.1.2.30 Thu Dec 3 17:34:35 2009 +++ src/doc/CHANGES-5.0.2 Wed Dec 9 04:47:29 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.30 2009/12/03 17:34:35 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.31 2009/12/09 04:47:29 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -866,3 +866,8 @@ Update BIND server and tools to version 9.5.2-P1. [tron, ticket #1178] +dist/ntp/ntpd/ntp_request.c patch + + Fix CVE-2009-3563. + [kardel, ticket #1185] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: snj Date: Thu Dec 3 17:31:47 UTC 2009 Modified Files: src/dist/bind [netbsd-5-0]: CHANGES COPYRIGHT FAQ FAQ.xml Makefile.in README README.idnkit acconfig.h config.guess config.h.in configure configure.in libtool.m4 ltmain.sh version src/dist/bind/bin/check [netbsd-5-0]: check-tool.c named-checkconf.8 named-checkconf.c named-checkconf.html named-checkzone.8 named-checkzone.c named-checkzone.docbook named-checkzone.html src/dist/bind/bin/dig [netbsd-5-0]: dig.1 dig.c dig.docbook dig.html dighost.c host.1 host.c host.docbook host.html nslookup.1 nslookup.c nslookup.html src/dist/bind/bin/dig/include/dig [netbsd-5-0]: dig.h src/dist/bind/bin/dnssec [netbsd-5-0]: dnssec-keygen.8 dnssec-keygen.docbook dnssec-keygen.html dnssec-signzone.8 dnssec-signzone.c dnssec-signzone.docbook dnssec-signzone.html src/dist/bind/bin/named [netbsd-5-0]: bind9.xsl bind9.xsl.h client.c config.c control.c controlconf.c convertxsl.pl interfacemgr.c log.c lwresd.8 lwresd.c lwresd.docbook lwresd.html main.c named.8 named.conf.5 named.conf.docbook named.conf.html named.docbook named.html query.c server.c statschannel.c update.c xfrout.c zoneconf.c src/dist/bind/bin/named/include/named [netbsd-5-0]: client.h globals.h log.h lwdclient.h notify.h server.h src/dist/bind/bin/named/unix [netbsd-5-0]: os.c src/dist/bind/bin/named/unix/include/named [netbsd-5-0]: os.h src/dist/bind/bin/named/win32 [netbsd-5-0]: ntservice.c os.c src/dist/bind/bin/named/win32/include/named [netbsd-5-0]: os.h src/dist/bind/bin/nsupdate [netbsd-5-0]: Makefile.in nsupdate.c nsupdate.docbook nsupdate.html src/dist/bind/bin/rndc [netbsd-5-0]: rndc-confgen.8 rndc-confgen.c rndc-confgen.html rndc.8 rndc.c rndc.conf.5 rndc.conf.html rndc.html src/dist/bind/bin/rndc/include/rndc [netbsd-5-0]: os.h src/dist/bind/bin/tests [netbsd-5-0]: cfg_test.c sig0_test.c sock_test.c src/dist/bind/bin/tests/db [netbsd-5-0]: t_db.c src/dist/bind/bin/tests/dst [netbsd-5-0]: Makefile.in dst_test.c t_dst.c src/dist/bind/bin/tests/master [netbsd-5-0]: t_master.c src/dist/bind/bin/tests/mem [netbsd-5-0]: t_mem.c src/dist/bind/bin/tests/names [netbsd-5-0]: t_names.c src/dist/bind/bin/tests/rbt [netbsd-5-0]: t_rbt.c src/dist/bind/bin/tests/system [netbsd-5-0]: ifconfig.sh src/dist/bind/bin/tests/system/acl [netbsd-5-0]: tests.sh src/dist/bind/bin/tests/system/glue/ns1 [netbsd-5-0]: named.conf src/dist/bind/bin/tests/system/rrsetorder [netbsd-5-0]: tests.sh src/dist/bind/bin/tests/system/tkey/ns1 [netbsd-5-0]: named.conf.in src/dist/bind/bin/tests/tasks [netbsd-5-0]: t_tasks.c src/dist/bind/bin/tests/timers [netbsd-5-0]: t_timers.c src/dist/bind/bin/win32/BINDInstall [netbsd-5-0]: BINDInstall.rc BINDInstallDlg.cpp BINDInstallDlg.h VersionInfo.cpp resource.h src/dist/bind/contrib/dlz [netbsd-5-0]: config.dlz.in src/dist/bind/contrib/dlz/drivers [netbsd-5-0]: dlz_bdb_driver.c dlz_mysql_driver.c src/dist/bind/contrib/idn/idnkit-1.0-src/tools/idnconv [netbsd-5-0]: selectiveencode.h src/dist/bind/contrib/queryperf/utils [netbsd-5-0]: gen-data-queryperf.py src/dist/bind/contrib/sdb/pgsql [netbsd-5-0]: zonetodb.c src/dist/bind/doc/arm [netbsd-5-0]: Bv9ARM-book.xml Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.ch10.html Bv9ARM.html Bv9ARM.pdf Makefile.in man.dig.html man.dnssec-keygen.html man.dnssec-signzone.html man.host.html man.named-checkconf.html man.named-checkzone.html man.named.html man.rndc-confgen.html man.rndc.conf.html man.rndc.html src/dist/bind/doc/misc [netbsd-5-0]: Makefile.in options src/dist/bind/doc/rfc [netbsd-5-0]: index src/dist/bind/doc/xsl [netbsd-5-0]: copyright.xsl src/dist/bind/lib/bind [netbsd-5-0]: api configure configure.in src/dist/bind/lib/bind/dst [netbsd-5-0]: dst_api.c hmac_link.c support.c src/dist/bind/lib/bind/include/isc [netbsd-5-0]: assertions.h src/dist/bind/lib/bind/inet [netbsd-5-0]: inet_net_pton.c src/dist/bind/lib/bind/irs [netbsd-5-0]: dns_ho.c src/dist/bind/lib/bind/isc [netbsd-5-0]: assertions.c bitncmp.c src/dist/bind/lib/bind9 [netbsd-5-0]: api check.c src/dist/bind/lib/bind9/include/bind9 [netbsd-5-0]: getaddresses.h src/dist/bind/lib/dns [netbsd-5-0]: acl.c adb.c api
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Thu Dec 3 17:34:35 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1178. To generate a diff of this commit: cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.29 src/doc/CHANGES-5.0.2:1.1.2.30 --- src/doc/CHANGES-5.0.2:1.1.2.29 Fri Nov 27 09:19:36 2009 +++ src/doc/CHANGES-5.0.2 Thu Dec 3 17:34:35 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.29 2009/11/27 09:19:36 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.30 2009/12/03 17:34:35 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -466,3 +466,403 @@ Fixes PR/42312. [dsl, ticket #1141] +dist/bind/CHANGESpatch +dist/bind/COPYRIGHTpatch +dist/bind/FAQ patch +dist/bind/FAQ.xmlpatch +dist/bind/KNOWN-DEFECTSdeleted +dist/bind/Makefile.inpatch +dist/bind/READMEpatch +dist/bind/README.idnkitpatch +dist/bind/acconfig.hpatch +dist/bind/bind.keysnew file +dist/bind/config.guesspatch +dist/bind/config.h.inpatch +dist/bind/configurepatch +dist/bind/configure.inpatch +dist/bind/isc-config.sh.1 new file +dist/bind/isc-config.sh.docbook new file +dist/bind/isc-config.sh.html new file +dist/bind/libtool.m4patch +dist/bind/ltmain.shpatch +dist/bind/versionpatch +dist/bind/bin/check/check-tool.c patch +dist/bind/bin/check/named-checkconf.8 patch +dist/bind/bin/check/named-checkconf.c patch +dist/bind/bin/check/named-checkconf.html patch +dist/bind/bin/check/named-checkzone.8 patch +dist/bind/bin/check/named-checkzone.c patch +dist/bind/bin/check/named-checkzone.docbook patch +dist/bind/bin/check/named-checkzone.html patch +dist/bind/bin/dig/dig.1patch +dist/bind/bin/dig/dig.cpatch +dist/bind/bin/dig/dig.docbook patch +dist/bind/bin/dig/dig.html patch +dist/bind/bin/dig/dighost.c patch +dist/bind/bin/dig/host.1 patch +dist/bind/bin/dig/host.c patch +dist/bind/bin/dig/host.docbook patch +dist/bind/bin/dig/host.html patch +dist/bind/bin/dig/nslookup.1 patch +dist/bind/bin/dig/nslookup.c patch +dist/bind/bin/dig/nslookup.html patch +dist/bind/bin/dig/include/dig/dig.h patch +dist/bind/bin/dnssec/dnssec-keygen.8 patch +dist/bind/bin/dnssec/dnssec-keygen.docbook patch +dist/bind/bin/dnssec/dnssec-keygen.html patch +dist/bind/bin/dnssec/dnssec-signzone.8 patch +dist/bind/bin/dnssec/dnssec-signzone.c patch +dist/bind/bin/dnssec/dnssec-signzone.docbook patch +dist/bind/bin/dnssec/dnssec-signzone.html patch +dist/bind/bin/named/bind9.xsl patch +dist/bind/bin/named/bind9.xsl.h patch +dist/bind/bin/named/client.c patch +dist/bind/bin/named/config.c patch +dist/bind/bin/named/control.c patch +dist/bind/bin/named/controlconf.c patch +dist/bind/bin/named/convertxsl.pl patch +dist/bind/bin/named/interfacemgr.c patch +dist/bind/bin/named/log.c patch +dist/bind/bin/named/lwresd.8 patch +dist/bind/bin/named/lwresd.c patch +dist/bind/bin/named/lwresd.docbook patch +dist/bind/bin/named/lwresd.html patch +dist/bind/bin/named/main.c patch +dist/bind/bin/named/named.8 patch +dist/bind/bin/named/named.conf.5 patch +dist/bind/bin/named/named.conf.docbook patch +dist/bind/bin/named/named.conf.html patch +dist/bind/bin/named/named.docbook patch +dist/bind/bin/named/named.html patch +dist/bind/bin/named/query.c patch +dist/bind/bin/named/server.c patch +dist/bind/bin/named/statschannel.c patch +dist/bind/bin/named/update.c patch +dist/bind/bin/named/xfrout.c patch +dist/bind/bin/named/zoneconf.c patch +dist/bind/bin/named/include/named/client.h patch +dist/bind/bin/named/include/named/globals.h patch +dist/bind/bin/named/include/named/log.h patch +dist/bind/bin/named/include/named/lwdclient.h patch +dist/bind/bin/named/include/named/notify.h patch +dist/bind/bin/named/include/named/server.h patch +dist/bind/bin/named/unix/os.c patch +dist/bind/bin/named/unix/include/named/os.h patch +dist/bind/bin/named/win32/ntservice.c patch +dist/bind/bin/named/win32/os.c patch +dist/bind/bin/named/win32/include/named/os.h patch +dist/bind/bin/nsupdate/Makefile.in patch +dist/bind/bin/nsupdate/nsupdate.1 new file +dist/bind/bin/nsupdate/nsupdate.8 deleted +dist/bind/bin/nsupdate/nsupdate.c patch +dist/bind/bin/nsupdate/nsupdate.docbook patch +dist/bind/bin/nsupdate/nsupdate.html patch +dist/bind/bin/rndc/rndc-confgen.8 patch +dist/bind/bin/rndc/rndc-confgen.c patch +dist/bind/bin/rndc/rndc-confgen.html patch +dist/bind/bin/rndc/rndc.8 patch +dist/bind/bin/rndc/rndc.c patch +dist/bind/bin/rndc/rndc.conf.5 patch +dist/bind/bin/rndc/rndc.conf.html patch +dist/bind/bin/rndc/rndc.html patch +dist/bind/bin/rndc/include/rndc/os.h patch +dist/bind/bin/tests/cfg_test.c patch
CVS commit: [netbsd-5-0] src/sbin/newfs_msdos
Module Name:src Committed By: sborrill Date: Fri Nov 27 09:02:15 UTC 2009 Modified Files: src/sbin/newfs_msdos [netbsd-5-0]: newfs_msdos.c Log Message: Pull up the following revisions(s) (requested by tsutsui in ticket #1163): sbin/newfs_msdos/newfs_msdos.c: revision 1.30 Make fs size detection get proper size rather than disk size. Without this, newfs_msdos(8) assumes the target fs size is whole disk size, so newfs_msdos(8) will fail or create wrong fs. To generate a diff of this commit: cvs rdiff -u -r1.27.2.2 -r1.27.2.2.2.1 src/sbin/newfs_msdos/newfs_msdos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/newfs_msdos/newfs_msdos.c diff -u src/sbin/newfs_msdos/newfs_msdos.c:1.27.2.2 src/sbin/newfs_msdos/newfs_msdos.c:1.27.2.2.2.1 --- src/sbin/newfs_msdos/newfs_msdos.c:1.27.2.2 Mon Feb 2 20:52:42 2009 +++ src/sbin/newfs_msdos/newfs_msdos.c Fri Nov 27 09:02:15 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: newfs_msdos.c,v 1.27.2.2 2009/02/02 20:52:42 snj Exp $ */ +/* $NetBSD: newfs_msdos.c,v 1.27.2.2.2.1 2009/11/27 09:02:15 sborrill Exp $ */ /* * Copyright (c) 1998 Robert Nordier @@ -33,7 +33,7 @@ static const char rcsid[] = $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $; #else -__RCSID($NetBSD: newfs_msdos.c,v 1.27.2.2 2009/02/02 20:52:42 snj Exp $); +__RCSID($NetBSD: newfs_msdos.c,v 1.27.2.2.2.1 2009/11/27 09:02:15 sborrill Exp $); #endif #endif /* not lint */ @@ -800,7 +800,7 @@ if (!bpb-hds) bpb-hds = ckgeom(fname, geo.dg_ntracks, drive heads); if (!bpb-bsec) - bpb-bsec = geo.dg_secperunit; + bpb-bsec = dkw.dkw_size; } }
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Fri Nov 27 09:04:12 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1163 To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.27 src/doc/CHANGES-5.0.2:1.1.2.28 --- src/doc/CHANGES-5.0.2:1.1.2.27 Sat Nov 21 20:07:02 2009 +++ src/doc/CHANGES-5.0.2 Fri Nov 27 09:04:12 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.27 2009/11/21 20:07:02 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.28 2009/11/27 09:04:12 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -452,3 +452,10 @@ ar_tha() can return NULL; treat this as an error. [christos, ticket #1156] +sbin/newfs_msdos/newfs_msdos.c 1.30 + + Make fs size detection get proper size rather than disk size. + Without this, newfs_msdos(8) assumes the target fs size is + whole disk size, so newfs_msdos(8) will fail or create wrong fs. + [tsutsui, ticket #1163] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: sborrill
Date: Fri Nov 27 09:19:13 UTC 2009
Modified Files:
src/sys/kern [netbsd-5-0]: tty_subr.c
Log Message:
Pull up the following revisions(s) (requested by dsl in ticket #1141):
sys/kern/tty_subr.c:revision 1.38
Fix clrbits() so that it doesn't mask no bits out of the byte after the
range (when the last bit to be cleared is the msb of a byte).
Fixes PR/42312.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/kern/tty_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/tty_subr.c
diff -u src/sys/kern/tty_subr.c:1.34 src/sys/kern/tty_subr.c:1.34.8.1
--- src/sys/kern/tty_subr.c:1.34 Wed Jul 16 18:27:49 2008
+++ src/sys/kern/tty_subr.c Fri Nov 27 09:19:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_subr.c,v 1.34 2008/07/16 18:27:49 drochner Exp $ */
+/* $NetBSD: tty_subr.c,v 1.34.8.1 2009/11/27 09:19:13 sborrill Exp $ */
/*
* Copyright (c) 1993, 1994 Theo de Raadt
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty_subr.c,v 1.34 2008/07/16 18:27:49 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty_subr.c,v 1.34.8.1 2009/11/27 09:19:13 sborrill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -316,10 +316,11 @@
return;
}
+ len--;
sby = off / NBBY;
sbi = off % NBBY;
eby = (off+len) / NBBY;
- ebi = (off+len) % NBBY;
+ ebi = (off+len) % NBBY + 1;
if (sby == eby) {
mask = ((1 (ebi - sbi)) - 1) sbi;
cp[sby] = ~mask;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Fri Nov 27 09:19:36 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1141 To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.28 src/doc/CHANGES-5.0.2:1.1.2.29 --- src/doc/CHANGES-5.0.2:1.1.2.28 Fri Nov 27 09:04:12 2009 +++ src/doc/CHANGES-5.0.2 Fri Nov 27 09:19:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.28 2009/11/27 09:04:12 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.29 2009/11/27 09:19:36 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -459,3 +459,10 @@ whole disk size, so newfs_msdos(8) will fail or create wrong fs. [tsutsui, ticket #1163] +sys/kern/tty_subr.c1.38 + + Fix clrbits() so that it doesn't mask no bits out of the byte after + the range (when the last bit to be cleared is the msb of a byte). + Fixes PR/42312. + [dsl, ticket #1141] +
CVS commit: [netbsd-5-0] src/sys
Module Name:src
Committed By: snj
Date: Sat Nov 21 19:56:35 UTC 2009
Modified Files:
src/sys/net [netbsd-5-0]: if_arcsubr.c if_ethersubr.c if_fddisubr.c
if_tokensubr.c
src/sys/netinet [netbsd-5-0]: if_arp.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1156):
sys/net/if_arcsubr.c: revision 1.61
sys/net/if_ethersubr.c: revision 1.173
sys/net/if_fddisubr.c: revision 1.78
sys/net/if_tokensubr.c: revision 1.58 via patch
sys/netinet/if_arp.c: revision 1.149
ar_tha() can return NULL; treat this as an error.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.22.1 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.169 -r1.169.6.1 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.76 -r1.76.10.1 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.54 -r1.54.12.1 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.143 -r1.143.6.1 src/sys/netinet/if_arp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.59 src/sys/net/if_arcsubr.c:1.59.22.1
--- src/sys/net/if_arcsubr.c:1.59 Wed Feb 20 17:05:52 2008
+++ src/sys/net/if_arcsubr.c Sat Nov 21 19:56:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.59 2008/02/20 17:05:52 matt Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.59.22.1 2009/11/21 19:56:35 snj Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_arcsubr.c,v 1.59 2008/02/20 17:05:52 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_arcsubr.c,v 1.59.22.1 2009/11/21 19:56:35 snj Exp $);
#include opt_inet.h
@@ -197,8 +197,12 @@
arph = mtod(m, struct arphdr *);
if (m-m_flags M_BCAST)
adst = arcbroadcastaddr;
- else
- adst = *ar_tha(arph);
+ else {
+ uint8_t *tha = ar_tha(arph);
+ if (tha == NULL)
+return 0;
+ adst = *tha;
+ }
arph-ar_hrd = htons(ARPHRD_ARCNET);
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.169 src/sys/net/if_ethersubr.c:1.169.6.1
--- src/sys/net/if_ethersubr.c:1.169 Wed Jul 23 06:34:31 2008
+++ src/sys/net/if_ethersubr.c Sat Nov 21 19:56:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.169 2008/07/23 06:34:31 dyoung Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.169.6.1 2009/11/21 19:56:35 snj Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.169 2008/07/23 06:34:31 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.169.6.1 2009/11/21 19:56:35 snj Exp $);
#include opt_inet.h
#include opt_atalk.h
@@ -301,7 +301,10 @@
else {
void *tha = ar_tha(ah);
- KASSERT(tha);
+ if (tha == NULL) {
+/* fake with ARPHDR_IEEE1394 */
+return 0;
+ }
memcpy(edst, tha, sizeof(edst));
}
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.76 src/sys/net/if_fddisubr.c:1.76.10.1
--- src/sys/net/if_fddisubr.c:1.76 Sun May 11 20:13:30 2008
+++ src/sys/net/if_fddisubr.c Sat Nov 21 19:56:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.76 2008/05/11 20:13:30 dyoung Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.76.10.1 2009/11/21 19:56:35 snj Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_fddisubr.c,v 1.76 2008/05/11 20:13:30 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_fddisubr.c,v 1.76.10.1 2009/11/21 19:56:35 snj Exp $);
#include opt_inet.h
#include opt_atalk.h
@@ -306,8 +306,8 @@
memcpy(edst, etherbroadcastaddr, sizeof(edst));
else {
void *tha = ar_tha(ah);
-
- KASSERT(tha);
+ if (tha == NULL)
+return 0;
memcpy(edst, tha, sizeof(edst));
}
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.54 src/sys/net/if_tokensubr.c:1.54.12.1
--- src/sys/net/if_tokensubr.c:1.54 Mon Apr 28 20:24:09 2008
+++ src/sys/net/if_tokensubr.c Sat Nov 21 19:56:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.54 2008/04/28 20:24:09 martin Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.54.12.1 2009/11/21 19:56:35 snj Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tokensubr.c,v 1.54 2008/04/28 20:24:09 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tokensubr.c,v 1.54.12.1 2009/11/21 19:56:35 snj Exp $);
#include opt_inet.h
#include opt_atalk.h
@@ -308,10 +308,10 @@
memcpy(edst, tokenbroadcastaddr, sizeof(edst));
}
else {
- void *tha = (void *)ar_tha(ah);
- KASSERT(tha);
- if (tha)
-bcopy(tha, (void *)edst, sizeof(edst));
+ void *tha = ar_tha(ah);
+ if (tha == NULL)
+return 0;
+ bcopy(tha, (void *)edst, sizeof(edst));
trh = (struct token_header *)M_TRHSTART(m);
trh-token_ac = TOKEN_AC;
trh-token_fc =
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sat Nov 21 20:07:02 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1156. To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.26 src/doc/CHANGES-5.0.2:1.1.2.27 --- src/doc/CHANGES-5.0.2:1.1.2.26 Sun Nov 15 06:08:45 2009 +++ src/doc/CHANGES-5.0.2 Sat Nov 21 20:07:02 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.26 2009/11/15 06:08:45 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.27 2009/11/21 20:07:02 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -443,3 +443,12 @@ Should address both PR port-alpha/38335 and PR port-alpha/42174. [mhitch, ticket #1137] +sys/net/if_arcsubr.c1.61 +sys/net/if_ethersubr.c1.173 +sys/net/if_fddisubr.c1.78 +sys/net/if_tokensubr.c1.58 via patch +sys/netinet/if_arp.c1.149 + + ar_tha() can return NULL; treat this as an error. + [christos, ticket #1156] +
CVS commit: [netbsd-5-0] src/sys/netinet6
Module Name:src Committed By: sborrill Date: Sat Nov 14 09:48:57 UTC 2009 Modified Files: src/sys/netinet6 [netbsd-5-0]: ip6_forward.c Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1139): sys/netinet6/ip6_forward.c: revision 1.67 Clear cksum flags before any further processing like ip_forward does. Many drivers set the UDP/TCP v4 flags even for v6 traffic and if the packet is encapsulated with gif, the IPv6 header would get corrupted by ip_output. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.65.18.1 src/sys/netinet6/ip6_forward.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet6/ip6_forward.c diff -u src/sys/netinet6/ip6_forward.c:1.65 src/sys/netinet6/ip6_forward.c:1.65.18.1 --- src/sys/netinet6/ip6_forward.c:1.65 Wed Apr 23 06:09:05 2008 +++ src/sys/netinet6/ip6_forward.c Sat Nov 14 09:48:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_forward.c,v 1.65 2008/04/23 06:09:05 thorpej Exp $ */ +/* $NetBSD: ip6_forward.c,v 1.65.18.1 2009/11/14 09:48:57 sborrill Exp $ */ /* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */ /* @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip6_forward.c,v 1.65 2008/04/23 06:09:05 thorpej Exp $); +__KERNEL_RCSID(0, $NetBSD: ip6_forward.c,v 1.65.18.1 2009/11/14 09:48:57 sborrill Exp $); #include opt_ipsec.h #include opt_pfil_hooks.h @@ -120,6 +120,10 @@ int s; #endif + /* + * Clear any in-bound checksum flags for this packet. + */ + m-m_pkthdr.csum_flags = 0; #ifdef IPSEC /*
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Sat Nov 14 09:49:16 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1139 To generate a diff of this commit: cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.24 src/doc/CHANGES-5.0.2:1.1.2.25 --- src/doc/CHANGES-5.0.2:1.1.2.24 Fri Nov 13 20:43:07 2009 +++ src/doc/CHANGES-5.0.2 Sat Nov 14 09:49:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.24 2009/11/13 20:43:07 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.25 2009/11/14 09:49:16 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -419,3 +419,11 @@ reported problems. [cube, ticket #1140] +sys/netinet6/ip6_forward.c 1.67 + + Clear cksum flags before any further processing like + ip_forward does. Many drivers set the UDP/TCP v4 flags even + for v6 traffic and if the packet is encapsulated with gif, + the IPv6 header would get corrupted by ip_output. + [joerg, ticket #1139] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sun Nov 15 06:08:45 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Tickets 1134 and 1137. To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.25 src/doc/CHANGES-5.0.2:1.1.2.26 --- src/doc/CHANGES-5.0.2:1.1.2.25 Sat Nov 14 09:49:16 2009 +++ src/doc/CHANGES-5.0.2 Sun Nov 15 06:08:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.25 2009/11/14 09:49:16 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.26 2009/11/15 06:08:45 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -427,3 +427,19 @@ the IPv6 header would get corrupted by ip_output. [joerg, ticket #1139] +sys/dev/rnd.c 1.77 + + rnd_sample_allocate_isr: pass correct flag to pool_get(). + Addresses PR/39325. + [rmind, ticket #1134] + +sys/arch/alpha/alpha/pmap.c 1.250 + + The tlb shootdown IPI can interrupt the pool_cache_get() in places + that can cause a deadlock or pool cache corruption. Take the + shootdown job queue mutex before calling pool_cache_get(), which + will block the IPI interrupts and seems to fix the remaining tlb + shootdown deadlocks and pool cache corruption I've been seeing. + Should address both PR port-alpha/38335 and PR port-alpha/42174. + [mhitch, ticket #1137] +
CVS commit: [netbsd-5-0] src/sys/arch/amd64/include
Module Name:src Committed By: sborrill Date: Fri Nov 13 20:42:49 UTC 2009 Added Files: src/sys/arch/amd64/include [netbsd-5-0]: Makefile.inc Log Message: Pull up the following revisions(s) (requested by cube in ticket #1140): sys/arch/amd64/include/Makefile.inc:revision 1.1 Build kernel modules with -mno-red-zone like kernel is build. This fixes frequent panics in amd64 zfs module, plus other reported problems. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/amd64/include/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/amd64/include/Makefile.inc diff -u /dev/null src/sys/arch/amd64/include/Makefile.inc:1.1.4.2 --- /dev/null Fri Nov 13 20:42:49 2009 +++ src/sys/arch/amd64/include/Makefile.inc Fri Nov 13 20:42:49 2009 @@ -0,0 +1,3 @@ +# $NetBSD: Makefile.inc,v 1.1.4.2 2009/11/13 20:42:49 sborrill Exp $ + +CFLAGS+=-mno-red-zone
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Fri Nov 13 20:43:07 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1140 To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.23 src/doc/CHANGES-5.0.2:1.1.2.24 --- src/doc/CHANGES-5.0.2:1.1.2.23 Sat Oct 31 13:30:17 2009 +++ src/doc/CHANGES-5.0.2 Fri Nov 13 20:43:07 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.23 2009/10/31 13:30:17 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.24 2009/11/13 20:43:07 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -412,3 +412,10 @@ cpus to halt and thus stop the machine hanging at shutdown. [mhitch, ticket #1118] +sys/arch/amd64/include/Makefile.inc 1.1 + + Build kernel modules with -mno-red-zone like kernel is built. + This fixes frequent panics in amd64 zfs module, plus other + reported problems. + [cube, ticket #1140] +
CVS commit: [netbsd-5-0] src/sys/arch/alpha/alpha
Module Name:src
Committed By: sborrill
Date: Sat Oct 31 13:29:53 UTC 2009
Modified Files:
src/sys/arch/alpha/alpha [netbsd-5-0]: machdep.c
Log Message:
Pull up the following revisions(s) (requested by mhitch in ticket #1118):
sys/arch/alpha/alpha/machdep.c: revision 1.321
Ensures the cpu running the shutdown waits for the correct cpus to halt
and thus stop the machine hanging at shutdown.
To generate a diff of this commit:
cvs rdiff -u -r1.307.4.1 -r1.307.4.1.2.1 src/sys/arch/alpha/alpha/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.307.4.1 src/sys/arch/alpha/alpha/machdep.c:1.307.4.1.2.1
--- src/sys/arch/alpha/alpha/machdep.c:1.307.4.1 Mon Feb 2 03:30:32 2009
+++ src/sys/arch/alpha/alpha/machdep.c Sat Oct 31 13:29:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.307.4.1 2009/02/02 03:30:32 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.307.4.1.2.1 2009/10/31 13:29:53 sborrill Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.307.4.1 2009/02/02 03:30:32 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.307.4.1.2.1 2009/10/31 13:29:53 sborrill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -965,8 +965,7 @@
{
#if defined(MULTIPROCESSOR)
u_long cpu_id = cpu_number();
- u_long wait_mask = (1UL cpu_id) |
- (1UL hwrpb-rpb_primary_cpu_id);
+ u_long wait_mask;
int i;
#endif
@@ -1000,6 +999,9 @@
* Halt all other CPUs. If we're not the primary, the
* primary will spin, waiting for us to halt.
*/
+ cpu_id = cpu_number(); /* may have changed cpu */
+ wait_mask = (1UL cpu_id) | (1UL hwrpb-rpb_primary_cpu_id);
+
alpha_broadcast_ipi(ALPHA_IPI_HALT);
/* Ensure any CPUs paused by DDB resume execution so they can halt */
CVS commit: [netbsd-5-0] src/sys/arch/sparc64
Module Name:src
Committed By: sborrill
Date: Mon Oct 19 09:01:43 UTC 2009
Modified Files:
src/sys/arch/sparc64/include [netbsd-5-0]: userret.h
src/sys/arch/sparc64/sparc64 [netbsd-5-0]: trap.c
Log Message:
Pull up the following revisions(s) (requested by nakayama in ticket #1103):
sys/arch/sparc64/include/userret.h: revision 1.9
sys/arch/sparc64/sparc64/trap.c:revision 1.158
Merge want_ast check in userret() into trap handler, and repeat preempt()
call while want_resched is true. While there remove unnecessary #if 1. This
should fix a performance degradation of disk I/O on heavy load.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.12.1 src/sys/arch/sparc64/include/userret.h
cvs rdiff -u -r1.155 -r1.155.8.1 src/sys/arch/sparc64/sparc64/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/include/userret.h
diff -u src/sys/arch/sparc64/include/userret.h:1.8 src/sys/arch/sparc64/include/userret.h:1.8.12.1
--- src/sys/arch/sparc64/include/userret.h:1.8 Mon Jun 30 14:12:20 2008
+++ src/sys/arch/sparc64/include/userret.h Mon Oct 19 09:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.8 2008/06/30 14:12:20 nakayama Exp $ */
+/* $NetBSD: userret.h,v 1.8.12.1 2009/10/19 09:01:43 sborrill Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -63,14 +63,6 @@
mi_userret(l);
- if (want_ast) {
- want_ast = 0;
- if (l-l_pflag LP_OWEUPC) {
- l-l_pflag = ~LP_OWEUPC;
- ADDUPROF(l);
- }
- }
-
/*
* If profiling, charge recent system time to the trapped pc.
*/
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.155 src/sys/arch/sparc64/sparc64/trap.c:1.155.8.1
--- src/sys/arch/sparc64/sparc64/trap.c:1.155 Wed Oct 15 06:51:19 2008
+++ src/sys/arch/sparc64/sparc64/trap.c Mon Oct 19 09:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.155 2008/10/15 06:51:19 wrstuden Exp $ */
+/* $NetBSD: trap.c,v 1.155.8.1 2009/10/19 09:01:43 sborrill Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.155 2008/10/15 06:51:19 wrstuden Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.155.8.1 2009/10/19 09:01:43 sborrill Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -618,12 +618,14 @@
#endif
case T_AST:
-#if 1
- if (want_resched)
+ if (l-l_pflag LP_OWEUPC) {
+ l-l_pflag = ~LP_OWEUPC;
+ ADDUPROF(l);
+ }
+ while (want_resched)
preempt();
want_ast = 0;
-#endif
- break; /* the work is all in userret() */
+ break;
case T_ILLINST:
case T_INST_EXCEPT:
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Mon Oct 19 09:02:02 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1103 To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.21 src/doc/CHANGES-5.0.2:1.1.2.22 --- src/doc/CHANGES-5.0.2:1.1.2.21 Sun Oct 18 16:06:21 2009 +++ src/doc/CHANGES-5.0.2 Mon Oct 19 09:02:02 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.21 2009/10/18 16:06:21 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.22 2009/10/19 09:02:02 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -397,3 +397,12 @@ - Don't dereference a null pointer for pkg_admin add [joerg, ticket #1075] +sys/arch/sparc64/include/userret.h 1.9 +sys/arch/sparc64/sparc64/trap.c 1.158 + + Merge want_ast check in userret() into trap handler, and + repeat preempt() call while want_resched is true. While + there remove unnecessary #if 1. This should fix a performance + degradation of disk I/O on heavy load. + [nakayama, ticket #1103] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 16:06:21 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1075 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.20 src/doc/CHANGES-5.0.2:1.1.2.21 --- src/doc/CHANGES-5.0.2:1.1.2.20 Fri Oct 16 06:48:50 2009 +++ src/doc/CHANGES-5.0.2 Sun Oct 18 16:06:21 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.20 2009/10/16 06:48:50 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.21 2009/10/18 16:06:21 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -338,3 +338,62 @@ mucking with the shootdown queue. [mhitch, ticket #1073] +external/bsd/pkg_install/dist/add/add.h 1.1.1.3 - 1.1.1.5 +external/bsd/pkg_install/dist/add/main.c 1.1.1.4 - 1.1.1.6 +external/bsd/pkg_install/dist/add/perform.c 1.1.1.10 - 1.1.1.12 +external/bsd/pkg_install/dist/add/pkg_add.1 1.1.1.8 +external/bsd/pkg_install/dist/admin/audit.c 1.1.1.6 +external/bsd/pkg_install/dist/admin/main.c 1.1.1.8 - 1.1.1.11 +external/bsd/pkg_install/dist/admin/pkg_admin.1 1.1.1.9 +external/bsd/pkg_install/dist/create/build.c 1.1.1.6 +external/bsd/pkg_install/dist/create/create.h 1.1.1.4 +external/bsd/pkg_install/dist/create/main.c 1.1.1.5 +external/bsd/pkg_install/dist/create/perform.c 1.1.1.4 +external/bsd/pkg_install/dist/delete/pkg_delete.1 1.1.1.5 - 1.1.1.6 +external/bsd/pkg_install/dist/delete/pkg_delete.c 1.1.1.5 +external/bsd/pkg_install/dist/info/info.h 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/info/main.c 1.1.1.6 - 1.1.1.7 +external/bsd/pkg_install/dist/info/perform.c 1.1.1.11 +external/bsd/pkg_install/dist/info/show.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/config.h.in 1.1.1.4 +external/bsd/pkg_install/dist/lib/conflicts.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/decompress.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/fexec.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/file.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/gpgsig.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/iterate.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/lib.h 1.1.1.8 - 1.1.1.9 +external/bsd/pkg_install/dist/lib/license.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/parse-config.c 1.1.1.5 - 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkcs7.c 1.1.1.4 +external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in 1.1.1.6 - 1.1.1.8 +external/bsd/pkg_install/dist/lib/pkg_io.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkg_signature.c 1.1.1.6 +external/bsd/pkg_install/dist/lib/pkgdb.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/plist.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/remove.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/var.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h 1.1.1.18 - 1.1.1.21 + + Update to pkg_install-20091008: + - pkg_add: add support to check license conditions before installation + - pkg_delete: add -k option to skip over preserve packages. + - WARNS=4 clean, fix some potential uses of uninitialized variables + - Add a new command for pkg_admin: findbest. It takes one or more + patterns and searches for the best match in PKG_PATH, just like + pkg_add would. + It prints the URLs of the best match for each pattern to stdout. + - Rewrite the config file parser to read the file only once. + - Fix a bug in pkg_add's -P handling. For dependencies the pkgdb path + was computed incorrectly and included destdir more than once. + - Fix the ACTIVE_FTP option to actually set the a flag and not the + old p flag. + - restore pkg_add -f functionality for missing dependencies (PR 42001) + - pkg_admin rebuild should count packages correctly (he@), also + count @pkgdir + - fix gpg-sign-package syntax in pkg_admin(1) + - change default URL for pkg-vulnerabilities to use HTTP + - Fix German accent + - Don't dereference a null pointer for pkg_admin add + [joerg, ticket #1075] +
CVS commit: [netbsd-5-0] src/sys/arch/alpha/alpha
Module Name:src
Committed By: snj
Date: Fri Oct 16 06:45:40 UTC 2009
Modified Files:
src/sys/arch/alpha/alpha [netbsd-5-0]: pmap.c
Log Message:
Pull up following revision(s) (requested by mhitch in ticket #1073):
sys/arch/alpha/alpha/pmap.c: revision 1.243
IPI interrupts occur above IPL_VM, so using IPL_VM in for the tlb shootdown
queue mutex doesn't work very well. I get various deadlocks and corrupted
queue entries. Change to IPL_SCHED [IPL_CLOCK] to block IPI interrupts
while the cpu is mucking with the shootdown queue.
To generate a diff of this commit:
cvs rdiff -u -r1.236.14.1 -r1.236.14.2 src/sys/arch/alpha/alpha/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.236.14.1 src/sys/arch/alpha/alpha/pmap.c:1.236.14.2
--- src/sys/arch/alpha/alpha/pmap.c:1.236.14.1 Wed Sep 16 04:26:04 2009
+++ src/sys/arch/alpha/alpha/pmap.c Fri Oct 16 06:45:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.236.14.1 2009/09/16 04:26:04 snj Exp $ */
+/* $NetBSD: pmap.c,v 1.236.14.2 2009/10/16 06:45:40 snj Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.236.14.1 2009/09/16 04:26:04 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.236.14.2 2009/10/16 06:45:40 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -963,7 +963,7 @@
for (i = 0; i ALPHA_MAXPROCS; i++) {
TAILQ_INIT(pmap_tlb_shootdown_q[i].pq_head);
mutex_init(pmap_tlb_shootdown_q[i].pq_lock, MUTEX_DEFAULT,
- IPL_VM);
+ IPL_SCHED);
}
#endif
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Fri Oct 16 06:48:50 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1073. To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.19 src/doc/CHANGES-5.0.2:1.1.2.20 --- src/doc/CHANGES-5.0.2:1.1.2.19 Thu Oct 15 08:22:31 2009 +++ src/doc/CHANGES-5.0.2 Fri Oct 16 06:48:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.19 2009/10/15 08:22:31 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.20 2009/10/16 06:48:50 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -330,3 +330,11 @@ merge of pkg_install-20090201. [joerg, ticket #784] +sys/arch/alpha/alpha/pmap.c 1.243 + + IPI interrupts occur above IPL_VM, so using IPL_VM in for the + tlb shootdown queue mutex doesn't work very well. Change to + IPL_SCHED [IPL_CLOCK] to block IPI interrupts while the cpu is + mucking with the shootdown queue. + [mhitch, ticket #1073] +
CVS commit: [netbsd-5-0] src/etc
Module Name:src Committed By: sborrill Date: Thu Oct 15 08:21:05 UTC 2009 Modified Files: src/etc [netbsd-5-0]: Makefile Removed Files: src/etc [netbsd-5-0]: audit-packages.conf Log Message: Pull up the following additional revisions(s) required by ticket #784: etc/Makefile: revision 1.365 etc/audit-packages.conf:removed Retire audit-packages.conf, it was obsoleted by the pullup of pkg_install-20090201. To generate a diff of this commit: cvs rdiff -u -r1.359.2.3 -r1.359.2.3.2.1 src/etc/Makefile cvs rdiff -u -r1.1 -r0 src/etc/audit-packages.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/Makefile diff -u src/etc/Makefile:1.359.2.3 src/etc/Makefile:1.359.2.3.2.1 --- src/etc/Makefile:1.359.2.3 Fri Mar 27 14:50:35 2009 +++ src/etc/Makefile Thu Oct 15 08:21:05 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.359.2.3 2009/03/27 14:50:35 msaitoh Exp $ +# $NetBSD: Makefile,v 1.359.2.3.2.1 2009/10/15 08:21:05 sborrill Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -88,7 +88,7 @@ BINOWN= root BINGRP= wheel UTMPGRP= utmp -BIN1+= audit-packages.conf bootptab changelist csh.cshrc csh.login \ +BIN1+= bootptab changelist csh.cshrc csh.login \ csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \ ftpusers gettytab group hosts hosts.lpd inetd.conf lkm.conf \ locate.conf login.conf mailer.conf man.conf monthly monthly.conf \
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Thu Oct 15 08:22:31 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Additional pullups for ticket 784 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.18 src/doc/CHANGES-5.0.2:1.1.2.19 --- src/doc/CHANGES-5.0.2:1.1.2.18 Wed Oct 14 18:40:01 2009 +++ src/doc/CHANGES-5.0.2 Thu Oct 15 08:22:31 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.18 2009/10/14 18:40:01 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.19 2009/10/15 08:22:31 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -323,3 +323,10 @@ Avoid segv on printf '%*s' 666. [christos, ticket #1091] +etc/Makefile 1.365 +etc/audit-packages.confremoved + + Retire audit-packages.conf, it was obsoleted by the + merge of pkg_install-20090201. + [joerg, ticket #784] +
CVS commit: [netbsd-5-0] src/usr.bin/printf
Module Name:src
Committed By: sborrill
Date: Wed Oct 14 18:37:30 UTC 2009
Modified Files:
src/usr.bin/printf [netbsd-5-0]: printf.c
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1091):
usr.bin/printf/printf.c:revision 1.34
Avoid segv on printf '%*s' 666.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 src/usr.bin/printf/printf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.33 src/usr.bin/printf/printf.c:1.33.8.1
--- src/usr.bin/printf/printf.c:1.33 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/printf/printf.c Wed Oct 14 18:37:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.33 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: printf.c,v 1.33.8.1 2009/10/14 18:37:30 sborrill Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = @(#)printf.c 8.2 (Berkeley) 3/22/95;
#else
-__RCSID($NetBSD: printf.c,v 1.33 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: printf.c,v 1.33.8.1 2009/10/14 18:37:30 sborrill Exp $);
#endif
#endif /* not lint */
@@ -155,7 +155,7 @@
gargv = ++argv;
#define SKIP1 #-+ 0
-#define SKIP2 *0123456789
+#define SKIP2 0123456789
do {
/*
* Basic algorithm is to scan the format string for conversion
@@ -185,13 +185,23 @@
/* skip to field width */
fmt += strspn(fmt, SKIP1);
- fieldwidth = *fmt == '*' ? getwidth() : -1;
+ if (*fmt == '*') {
+fmt++;
+fieldwidth = getwidth();
+ } else
+fieldwidth = -1;
/* skip to possible '.', get following precision */
fmt += strspn(fmt, SKIP2);
- if (*fmt == '.')
-++fmt;
- precision = *fmt == '*' ? getwidth() : -1;
+ if (*fmt == '.') {
+fmt++;
+if (*fmt == '*') {
+ fmt++;
+ precision = getwidth();
+} else
+ precision = -1;
+ } else
+precision = -1;
fmt += strspn(fmt, SKIP2);
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 18:40:01 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1091 To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.17 src/doc/CHANGES-5.0.2:1.1.2.18 --- src/doc/CHANGES-5.0.2:1.1.2.17 Mon Oct 12 10:52:18 2009 +++ src/doc/CHANGES-5.0.2 Wed Oct 14 18:40:01 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.17 2009/10/12 10:52:18 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.18 2009/10/14 18:40:01 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -318,3 +318,8 @@ this there is a simple local-user panic in ureadc(). [dsl, ticket #1087] +usr.bin/printf/printf.c1.34 + + Avoid segv on printf '%*s' 666. + [christos, ticket #1091] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src Committed By: sborrill Date: Mon Oct 12 10:51:59 UTC 2009 Modified Files: src/sys/kern [netbsd-5-0]: tty.c Log Message: Pull up the following revisions(s) (requested by dsl in ticket #1087): sys/kern/tty.c: revision 1.234 Check for zero length read here - and return zero. Without this there is a simple local-user panic in ureadc(). To generate a diff of this commit: cvs rdiff -u -r1.227.4.1 -r1.227.4.1.2.1 src/sys/kern/tty.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/tty.c diff -u src/sys/kern/tty.c:1.227.4.1 src/sys/kern/tty.c:1.227.4.1.2.1 --- src/sys/kern/tty.c:1.227.4.1 Fri Feb 6 02:05:18 2009 +++ src/sys/kern/tty.c Mon Oct 12 10:51:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: tty.c,v 1.227.4.1 2009/02/06 02:05:18 snj Exp $ */ +/* $NetBSD: tty.c,v 1.227.4.1.2.1 2009/10/12 10:51:59 sborrill Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.227.4.1 2009/02/06 02:05:18 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.227.4.1.2.1 2009/10/12 10:51:59 sborrill Exp $); #include sys/param.h #include sys/systm.h @@ -1655,6 +1655,9 @@ long lflag, slp; struct timeval now, stime; + if (uio-uio_resid == 0) + return 0; + stime.tv_usec = 0; /* XXX gcc */ stime.tv_sec = 0; /* XXX gcc */
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Mon Oct 12 10:52:18 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1087 To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.16 src/doc/CHANGES-5.0.2:1.1.2.17 --- src/doc/CHANGES-5.0.2:1.1.2.16 Sun Oct 4 11:51:12 2009 +++ src/doc/CHANGES-5.0.2 Mon Oct 12 10:52:18 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.16 2009/10/04 11:51:12 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.17 2009/10/12 10:52:18 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -312,3 +312,9 @@ Only generate SHA512 and MD5 checksums for releases. [snj, ticket #1066] +sys/kern/tty.c 1.234 + + Check for zero length read here - and return zero. Without + this there is a simple local-user panic in ureadc(). + [dsl, ticket #1087] +
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: bouyer
Date: Sun Oct 4 11:50:27 UTC 2009
Modified Files:
src/distrib/cdrom [netbsd-5-0]: hide-hfs.lst
src/distrib/mac68k/stand [netbsd-5-0]: Makefile
src/distrib/notes/common [netbsd-5-0]: main
src/distrib/sets [netbsd-5-0]: Makefile makesrctars makesums
src/share/man/man7 [netbsd-5-0]: release.7
Log Message:
Pull up following revision(s) (requested by snj in ticket #1066):
distrib/notes/common/main: revision 1.451
share/man/man7/release.7: revision 1.31 via patch
distrib/mac68k/stand/Makefile: revision 1.6
distrib/sets/makesums: revision 1.16
distrib/sets/Makefile: revision 1.70
distrib/sets/makesrctars: revision 1.37
distrib/cdrom/hide-hfs.lst: revision 1.5
Sync release(7) with reality.
Only generate SHA512 and MD5 checksums for releases.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.46.1 src/distrib/cdrom/hide-hfs.lst
cvs rdiff -u -r1.5 -r1.5.6.1 src/distrib/mac68k/stand/Makefile
cvs rdiff -u -r1.425.2.5.2.1 -r1.425.2.5.2.2 src/distrib/notes/common/main
cvs rdiff -u -r1.63.2.1 -r1.63.2.1.2.1 src/distrib/sets/Makefile
cvs rdiff -u -r1.34 -r1.34.10.1 src/distrib/sets/makesrctars
cvs rdiff -u -r1.15 -r1.15.32.1 src/distrib/sets/makesums
cvs rdiff -u -r1.25 -r1.25.8.1 src/share/man/man7/release.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cdrom/hide-hfs.lst
diff -u src/distrib/cdrom/hide-hfs.lst:1.4 src/distrib/cdrom/hide-hfs.lst:1.4.46.1
--- src/distrib/cdrom/hide-hfs.lst:1.4 Thu Nov 30 05:14:01 2000
+++ src/distrib/cdrom/hide-hfs.lst Sun Oct 4 11:50:27 2009
@@ -1,7 +1,5 @@
-BSDSUM
-CKSUM
MD5
-SYSVSUM
+SHA512
TRANS.TBL
INSTALL.more
./boot
Index: src/distrib/mac68k/stand/Makefile
diff -u src/distrib/mac68k/stand/Makefile:1.5 src/distrib/mac68k/stand/Makefile:1.5.6.1
--- src/distrib/mac68k/stand/Makefile:1.5 Mon Jun 23 02:16:53 2008
+++ src/distrib/mac68k/stand/Makefile Sun Oct 4 11:50:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/06/23 02:16:53 matt Exp $
+# $NetBSD: Makefile,v 1.5.6.1 2009/10/04 11:50:26 bouyer Exp $
#
.include bsd.own.mk
@@ -18,7 +18,7 @@
${RELEASE_INSTALL} ${DISTRIBDIR}/mac68k/stand/extensions.map \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
rm -f \
- ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/{BSDSUM,CKSUM,MD5,SYSVSUM}
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/{MD5,SHA512}
for i in BSD_Mac68k_Booter.bin Mkfs.sea.hqx Booter-HTML-manual-12.tar \
Mkfs_1.47.sea.bin Mkfs_1.47.sea.hqx Booter2.0.0.sea \
BooterManual.stxt.bin NetBSD_ROM.sit.hqx Installer.sea.hqx \
@@ -31,31 +31,22 @@
do \
${RELEASE_INSTALL} $$i ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc ; \
(cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc ; \
- ${TOOL_CKSUM} -o1 `basename $$i` BSDSUM) ; \
- (cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc ; \
- ${TOOL_CKSUM} `basename $$i` CKSUM) ; \
- (cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc ; \
${TOOL_CKSUM} -a MD5 `basename $$i` MD5) ; \
(cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc ; \
- ${TOOL_CKSUM} -o2 `basename $$i` SYSVSUM) ; \
+ ${TOOL_CKSUM} -a SHA512 `basename $$i` SHA512) ; \
done
${INSTALL} -d ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src
rm -f \
- ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src/{BSDSUM,CKSUM,MD5}
- rm -f ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src/SYSVSUM
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src/{MD5,SHA512}
for i in Booter2.0.0-src.sea Mkfs_1.47src.sea.hqx \
Installer_1.1g.src.sea.hqx Installer_1.1h.src.sea.hqx ; \
do \
${RELEASE_INSTALL} $$i \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src ; \
(cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src ; \
- ${TOOL_CKSUM} -o1 `basename $$i` BSDSUM) ; \
- (cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src ; \
- ${TOOL_CKSUM} `basename $$i` CKSUM) ; \
- (cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src ; \
${TOOL_CKSUM} -a MD5 `basename $$i` MD5) ; \
(cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/src ; \
- ${TOOL_CKSUM} -o2 `basename $$i` SYSVSUM) ; \
+ ${TOOL_CKSUM} -a SHA512 `basename $$i` SHA512) ; \
done
.include bsd.files.mk
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.5.2.1 src/distrib/notes/common/main:1.425.2.5.2.2
--- src/distrib/notes/common/main:1.425.2.5.2.1 Wed Jul 29 22:28:46 2009
+++ src/distrib/notes/common/main Sun Oct 4 11:50:26 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.425.2.5.2.1 2009/07/29 22:28:46 snj Exp $
+.\ $NetBSD: main,v 1.425.2.5.2.2 2009/10/04 11:50:26 bouyer Exp $
.\
.\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 4 11:51:12 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1066 To generate a diff of this commit: cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.15 src/doc/CHANGES-5.0.2:1.1.2.16 --- src/doc/CHANGES-5.0.2:1.1.2.15 Sun Oct 4 00:57:06 2009 +++ src/doc/CHANGES-5.0.2 Sun Oct 4 11:51:12 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.15 2009/10/04 00:57:06 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.16 2009/10/04 11:51:12 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -300,3 +300,15 @@ Do not require sys/mtio.h for a tools build of pax. [apb, ticket #1020] +distrib/cdrom/hide-hfs.lst 1.5 +distrib/mac68k/stand/Makefile 1.6 +distrib/notes/common/main 1.451 +distrib/sets/Makefile1.70 +distrib/sets/makesrctars 1.37 +distrib/sets/makesums1.16 +share/man/man7/release.7 1.31 via patch + + Sync release(7) with reality. + Only generate SHA512 and MD5 checksums for releases. + [snj, ticket #1066] +
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: snj
Date: Sat Oct 3 21:30:37 UTC 2009
Modified Files:
src/bin/pax [netbsd-5-0]: Makefile ar_io.c
src/tools/compat [netbsd-5-0]: configure configure.ac
Log Message:
Pull up following revision(s) (requested by apb in ticket #1020):
bin/pax/Makefile: revision 1.38
bin/pax/ar_io.c: revision 1.49
tools/compat/configure: revision 1.69
tools/compat/configure.ac: revision 1.69
do not require sys/mtio.h for a tools build of pax
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.10.1 src/bin/pax/Makefile
cvs rdiff -u -r1.48 -r1.48.20.1 src/bin/pax/ar_io.c
cvs rdiff -u -r1.67.2.1 -r1.67.2.1.2.1 src/tools/compat/configure \
src/tools/compat/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/Makefile
diff -u src/bin/pax/Makefile:1.37 src/bin/pax/Makefile:1.37.10.1
--- src/bin/pax/Makefile:1.37 Sun Feb 24 20:42:46 2008
+++ src/bin/pax/Makefile Sat Oct 3 21:30:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/02/24 20:42:46 joerg Exp $
+# $NetBSD: Makefile,v 1.37.10.1 2009/10/03 21:30:36 snj Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include bsd.own.mk
@@ -25,12 +25,13 @@
MAN= pax.1 tar.1 cpio.1
-# XXX: Interix does not have it; we need a conditional for it.
-CPPFLAGS+= -DHAVE_MTIO_H
-
.if defined(HOSTPROG)
CPPFLAGS+= -DHOSTPROG
.else # { ! HOSTPROG
+
+# XXX: Interix does not have it; we need a conditional for it.
+CPPFLAGS+= -DHAVE_SYS_MTIO_H
+
LINKS+= ${BINDIR}/pax ${BINDIR}/tar
SYMLINKS+=${BINDIR}/tar /usr/bin/tar
Index: src/bin/pax/ar_io.c
diff -u src/bin/pax/ar_io.c:1.48 src/bin/pax/ar_io.c:1.48.20.1
--- src/bin/pax/ar_io.c:1.48 Mon Apr 23 18:40:22 2007
+++ src/bin/pax/ar_io.c Sat Oct 3 21:30:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_io.c,v 1.48 2007/04/23 18:40:22 christos Exp $ */
+/* $netbsd: ar_io.c,v 1.48 2007/04/23 18:40:22 christos Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)ar_io.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: ar_io.c,v 1.48 2007/04/23 18:40:22 christos Exp $);
+__RCSID($NetBSD: ar_io.c,v 1.48.20.1 2009/10/03 21:30:36 snj Exp $);
#endif
#endif /* not lint */
@@ -51,7 +51,7 @@
#include sys/time.h
#include sys/stat.h
#include sys/ioctl.h
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
#include sys/mtio.h
#endif
#include sys/wait.h
@@ -99,7 +99,7 @@
time_t starttime; /* time the run started */
int force_one_volume; /* 1 if we ignore volume changes */
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
static int get_phys(void);
#endif
extern sigset_t s_mask;
@@ -129,7 +129,7 @@
int
ar_open(const char *name)
{
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
struct mtget mb;
#endif
@@ -220,7 +220,7 @@
}
if (S_ISCHR(arsb.st_mode)) {
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
artyp = ioctl(arfd, MTIOCGET, mb) ? ISCHR : ISTAPE;
#else
tty_warn(1, System does not have tape support);
@@ -941,7 +941,7 @@
long fsbz;
off_t cpos;
off_t mpos;
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
struct mtop mb;
#endif
@@ -965,7 +965,7 @@
case ISRMT:
#endif /* SUPPORT_RMT */
case ISTAPE:
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
/*
* if the last i/o was a successful data transfer, we assume
* the fault is just a bad record on the tape that we are now
@@ -1109,7 +1109,7 @@
ar_rev(off_t sksz)
{
off_t cpos;
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
int phyblk;
struct mtop mb;
#endif
@@ -1180,7 +1180,7 @@
#ifdef SUPPORT_RMT
case ISRMT:
#endif /* SUPPORT_RMT */
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
/*
* Calculate and move the proper number of PHYSICAL tape
* blocks. If the sksz is not an even multiple of the physical
@@ -1242,7 +1242,7 @@
return 0;
}
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
/*
* get_phys()
* Determine the physical block size on a tape drive. We need the physical
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.67.2.1 src/tools/compat/configure:1.67.2.1.2.1
--- src/tools/compat/configure:1.67.2.1 Thu Jan 15 04:30:19 2009
+++ src/tools/compat/configure Sat Oct 3 21:30:36 2009
@@ -2328,7 +2328,7 @@
# These are not necessarily required by the code, but they are not
# currently conditionalized.
-for ac_header in sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
+for ac_header in sys/ioctl.h sys/mman.h sys/param.h \
sys/socket.h sys/stat.h sys/time.h sys/types.h sys/utsname.h \
sys/wait.h assert.h ctype.h errno.h fcntl.h grp.h limits.h locale.h \
netdb.h pwd.h signal.h stdarg.h stdio.h stdlib.h string.h \
@@ -2551,7 +2551,7 @@
fi
-for ac_header in sys/sysmacros.h sys/syslimits.h \
+for ac_header in sys/mtio.h sys/sysmacros.h sys/syslimits.h \
getopt.h features.h malloc.h sys/poll.h stddef.h
do
as_ac_Header=`echo ac_cv_header_$ac_header | $as_tr_sh`
Index:
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sun Oct 4 00:57:06 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1020. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.14 src/doc/CHANGES-5.0.2:1.1.2.15 --- src/doc/CHANGES-5.0.2:1.1.2.14 Wed Sep 16 04:58:53 2009 +++ src/doc/CHANGES-5.0.2 Sun Oct 4 00:57:06 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.14 2009/09/16 04:58:53 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.15 2009/10/04 00:57:06 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -292,3 +292,11 @@ quite nicely on a 4000/90. [mhitch, ticket #955] +bin/pax/Makefile1.38 +bin/pax/ar_io.c 1.49 +tools/compat/configure1.69 +tools/compat/configure.ac 1.69 + + Do not require sys/mtio.h for a tools build of pax. + [apb, ticket #1020] +
CVS commit: [netbsd-5-0] src/sys/dev
Module Name:src Committed By: snj Date: Wed Sep 16 04:04:40 UTC 2009 Modified Files: src/sys/dev [netbsd-5-0]: rnd.c Log Message: Pull up following revision(s) (requested by pooka in ticket #948): sys/dev/rnd.c: revision 1.74 rnd_wakeup_readers() uses rndpool_mtx for its own consistency management, so it cannot be called with the mutex held. There is no consistency requirement to synchronize over the whole add-and-wakeup operation, as if data is consumed in the window the mutex is locked, wakeups will simply be skipped. fix from Juho Salminen in PR kern/42020. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.71.10.1 src/sys/dev/rnd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/rnd.c diff -u src/sys/dev/rnd.c:1.71 src/sys/dev/rnd.c:1.71.10.1 --- src/sys/dev/rnd.c:1.71 Sat Aug 16 13:07:30 2008 +++ src/sys/dev/rnd.c Wed Sep 16 04:04:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rnd.c,v 1.71 2008/08/16 13:07:30 dan Exp $ */ +/* $NetBSD: rnd.c,v 1.71.10.1 2009/09/16 04:04:39 snj Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rnd.c,v 1.71 2008/08/16 13:07:30 dan Exp $); +__KERNEL_RCSID(0, $NetBSD: rnd.c,v 1.71.10.1 2009/09/16 04:04:39 snj Exp $); #include sys/param.h #include sys/ioctl.h @@ -639,9 +639,9 @@ mutex_enter(rndpool_mtx); rndpool_add_data(rnd_pool, rnddata-data, rnddata-len, rnddata-entropy); + mutex_exit(rndpool_mtx); rnd_wakeup_readers(); - mutex_exit(rndpool_mtx); break;
CVS commit: [netbsd-5-0] src/sys/arch/alpha/alpha
Module Name:src Committed By: snj Date: Wed Sep 16 04:14:33 UTC 2009 Modified Files: src/sys/arch/alpha/alpha [netbsd-5-0]: cpu.c Log Message: Pull up following revision(s) (requested by mhitch in ticket #949): sys/arch/alpha/alpha/cpu.c: revision 1.86 There's now some per-cpu initialization that occurs before the secondary cpus are told to begin running. Since the seconedary cpus weren't being added to the cpu_info list until then, that initialization wasn't being done and resulted in crashes on the secondary cpus. Add the secondary cpus to the cpu_info_list after they've been started (but waiting to be told to start running). This fixes the problem specifically stated in PR port-alpha/41106. MP alphas will now at least boot and begin running, but will eventually crash in various ways later. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.82.14.1 src/sys/arch/alpha/alpha/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/alpha/cpu.c diff -u src/sys/arch/alpha/alpha/cpu.c:1.82 src/sys/arch/alpha/alpha/cpu.c:1.82.14.1 --- src/sys/arch/alpha/alpha/cpu.c:1.82 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/alpha/alpha/cpu.c Wed Sep 16 04:14:33 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.82 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: cpu.c,v 1.82.14.1 2009/09/16 04:14:33 snj Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.82 2008/04/28 20:23:10 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.82.14.1 2009/09/16 04:14:33 snj Exp $); #include opt_ddb.h #include opt_multiprocessor.h @@ -337,6 +337,12 @@ * on its merry way. */ cpu_boot_secondary(ci); + + /* + * Link the processor into the list. + */ + ci-ci_next = cpu_info_list-ci_next; + cpu_info_list-ci_next = ci; #else /* ! MULTIPROCESSOR */ printf(%s: processor off-line; multiprocessor support not present in kernel\n, sc-sc_dev.dv_xname); @@ -408,10 +414,8 @@ } /* - * Link the processor into the list, and launch it. + * Launch the processor. */ - ci-ci_next = cpu_info_list-ci_next; - cpu_info_list-ci_next = ci; atomic_or_ulong(ci-ci_flags, CPUF_RUNNING); atomic_or_ulong(cpus_running, (1U i)); }
CVS commit: [netbsd-5-0] src/sys/arch/alpha/alpha
Module Name:src Committed By: snj Date: Wed Sep 16 04:26:04 UTC 2009 Modified Files: src/sys/arch/alpha/alpha [netbsd-5-0]: pmap.c Log Message: Pull up following revision(s) (requested by mhitch in ticket #953): sys/arch/alpha/alpha/pmap.c: revision 1.241 Now that secondary cpus are added the cpu_info list earlier, attempt to send pmap tlb shootdowns to them cause the shootdown job queue to fill up, but since the cpus aren't running yet, no IPIs get sent. When the job queue is full, the bit mask of cpus to send the IPI to is not set and no shootdown IPI ever gets sent after the cpu is marked running. Always set the cpumask even when the queue is full. Now I get shootdown ipis on all the secondary cpus. To generate a diff of this commit: cvs rdiff -u -r1.236 -r1.236.14.1 src/sys/arch/alpha/alpha/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/alpha/pmap.c diff -u src/sys/arch/alpha/alpha/pmap.c:1.236 src/sys/arch/alpha/alpha/pmap.c:1.236.14.1 --- src/sys/arch/alpha/alpha/pmap.c:1.236 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/alpha/alpha/pmap.c Wed Sep 16 04:26:04 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.236 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: pmap.c,v 1.236.14.1 2009/09/16 04:26:04 snj Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc. @@ -140,7 +140,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.236 2008/04/28 20:23:10 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.236.14.1 2009/09/16 04:26:04 snj Exp $); #include sys/param.h #include sys/systm.h @@ -3681,6 +3681,8 @@ continue; } + cpumask |= 1UL ci-ci_cpuid; + pq = pmap_tlb_shootdown_q[ci-ci_cpuid]; /* @@ -3720,7 +3722,6 @@ pq-pq_count++; TAILQ_INSERT_TAIL(pq-pq_head, pj, pj_list); } - cpumask |= 1UL ci-ci_cpuid; mutex_spin_exit(pq-pq_lock); }
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Wed Sep 16 04:58:54 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Tickets 945, 948, 953, and 955. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.13 src/doc/CHANGES-5.0.2:1.1.2.14 --- src/doc/CHANGES-5.0.2:1.1.2.13 Fri Sep 11 23:02:24 2009 +++ src/doc/CHANGES-5.0.2 Wed Sep 16 04:58:53 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.13 2009/09/11 23:02:24 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.14 2009/09/16 04:58:53 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -244,3 +244,51 @@ Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425. [snj, ticket #951] +sys/dev/pad/padvol.c1.4 + + Catch up to audio(4) device_t/softc split. + [jmcneill, ticket #945] + +sys/dev/rnd.c 1.74 + + rnd_wakeup_readers() uses rndpool_mtx for its own consistency + management, so it cannot be called with the mutex held. There + is no consistency requirement to synchronize over the whole + add-and-wakeup operation, as if data is consumed in the window + the mutex is locked, wakeups will simply be skipped. + + Fix from Juho Salminen in PR kern/42020. + [pooka, ticket #948] + +sys/arch/alpha/alpha/cpu.c 1.86 + + There's now some per-cpu initialization that occurs before the + secondary cpus are told to begin running. Since the seconedary + cpus weren't being added to the cpu_info list until then, that + initialization wasn't being done and resulted in crashes on the + secondary cpus. Add the secondary cpus to the cpu_info_list + after they've been started (but waiting to be told to start + running). This fixes the problem specifically stated in PR + port-alpha/41106. MP alphas will now at least boot and begin + running, but will eventually crash in various ways later. + [mhitch, ticket #949] + +sys/arch/alpha/alpha/pmap.c 1.241 + + Now that secondary cpus are added the cpu_info list earlier, + attempt to send pmap tlb shootdowns to them cause the shootdown + job queue to fill up, but since the cpus aren't running yet, no + IPIs get sent. When the job queue is full, the bit mask of cpus + to send the IPI to is not set and no shootdown IPI ever gets sent + after the cpu is marked running. Always set the cpumask even when + the queue is full. + [mhitch, ticket #953] + +sys/arch/vax/vax/clock.c 1.51 + + Keep track of the previous ICR value and hardclock_ticks to ensure + the 32 bit counter doesn't go backwards. Also, the ICR runs from + -1 to -1, so adjust the value when reading it. Now mfpr works + quite nicely on a 4000/90. + [mhitch, ticket #955] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Fri Sep 11 23:02:24 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: ticket #951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.12 src/doc/CHANGES-5.0.2:1.1.2.13 --- src/doc/CHANGES-5.0.2:1.1.2.12 Thu Sep 10 07:42:49 2009 +++ src/doc/CHANGES-5.0.2 Fri Sep 11 23:02:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.12 2009/09/10 07:42:49 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.13 2009/09/11 23:02:24 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -238,3 +238,9 @@ anymore by default. [tnozaki, ticket #938] +xsrc/external/mit/expat/dist/lib/xmltok_impl.c 1.2 +xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c 1.2 + + Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425. + [snj, ticket #951] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Thu Sep 10 07:42:49 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Tickets 931 and 938. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.11 src/doc/CHANGES-5.0.2:1.1.2.12 --- src/doc/CHANGES-5.0.2:1.1.2.11 Sat Sep 5 16:24:20 2009 +++ src/doc/CHANGES-5.0.2 Thu Sep 10 07:42:49 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.11 2009/09/05 16:24:20 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.12 2009/09/10 07:42:49 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -226,3 +226,15 @@ don't panic when the driver fails to map registers. [jmcneill, ticket #939] +sys/dev/ic/mfi.c1.28 via patch + + Fix command list corruption seen on heavy I/O load on the mfi + driver(4). + [bouyer, ticket #931] + +dist/nvi/regex/regcomp.c 1.5 + + Fix PR bin/41781, the pattern /\$/ doesn't match a dollar sign + anymore by default. + [tnozaki, ticket #938] +
CVS commit: [netbsd-5-0] src/lib/libc/stdio
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:40:11 UTC 2009
Modified Files:
src/lib/libc/stdio [netbsd-5-0]: vfwprintf.c
Log Message:
Pull up following revision(s) (requested by dsl in ticket #902):
lib/libc/stdio/vfwprintf.c: revision 1.16
If the current locale doesn't define the 'thousands' grouping info
then use sane defaults (',' every 3 digits).
Fixes PR/40714
To generate a diff of this commit:
cvs rdiff -u -r1.13.4.1 -r1.13.4.1.2.1 src/lib/libc/stdio/vfwprintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.13.4.1 src/lib/libc/stdio/vfwprintf.c:1.13.4.1.2.1
--- src/lib/libc/stdio/vfwprintf.c:1.13.4.1 Wed Feb 25 03:24:14 2009
+++ src/lib/libc/stdio/vfwprintf.c Sat Sep 5 11:40:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.13.4.1 2009/02/25 03:24:14 snj Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.13.4.1.2.1 2009/09/05 11:40:11 bouyer Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = @(#)vfprintf.c 8.1 (Berkeley) 6/4/93;
__FBSDID($FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $);
#else
-__RCSID($NetBSD: vfwprintf.c,v 1.13.4.1 2009/02/25 03:24:14 snj Exp $);
+__RCSID($NetBSD: vfwprintf.c,v 1.13.4.1.2.1 2009/09/05 11:40:11 bouyer Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -897,6 +897,12 @@
flags |= GROUPING;
thousands_sep = *(localeconv()-thousands_sep);
grouping = localeconv()-grouping;
+ /* If the locale doesn't define the above, use sane
+ * defaults - otherwise silly things happen! */
+ if (thousands_sep == 0)
+thousands_sep = ',';
+ if (!grouping || !*grouping)
+grouping = \3;
goto rflag;
case '.':
if ((ch = *fmt++) == '*') {
CVS commit: [netbsd-5-0] src/sbin/fsck_ext2fs
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:45:20 UTC 2009
Modified Files:
src/sbin/fsck_ext2fs [netbsd-5-0]: main.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #914):
sbin/fsck_ext2fs/main.c: revision 1.33
Ignore the -P option as intended to make this work with e.g.
fsck_flags=3D-pP in /etc/rc.conf.
Patch supplied by Pierre Pronchery in PR bin/41490.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.6.1 src/sbin/fsck_ext2fs/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ext2fs/main.c
diff -u src/sbin/fsck_ext2fs/main.c:1.32 src/sbin/fsck_ext2fs/main.c:1.32.6.1
--- src/sbin/fsck_ext2fs/main.c:1.32 Sun Oct 12 20:49:43 2008
+++ src/sbin/fsck_ext2fs/main.c Sat Sep 5 11:45:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.32 2008/10/12 20:49:43 wiz Exp $ */
+/* $NetBSD: main.c,v 1.32.6.1 2009/09/05 11:45:20 bouyer Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = @(#)main.c 8.2 (Berkeley) 1/23/94;
#else
-__RCSID($NetBSD: main.c,v 1.32 2008/10/12 20:49:43 wiz Exp $);
+__RCSID($NetBSD: main.c,v 1.32.6.1 2009/09/05 11:45:20 bouyer Exp $);
#endif
#endif /* not lint */
@@ -107,7 +107,7 @@
sync();
skipclean = 1;
- while ((ch = getopt(argc, argv, b:dfm:npqUy)) != -1) {
+ while ((ch = getopt(argc, argv, b:dfm:npPqUy)) != -1) {
switch (ch) {
case 'b':
skipclean = 0;
CVS commit: [netbsd-5-0] src/usr.bin/newsyslog
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 12:58:29 UTC 2009
Modified Files:
src/usr.bin/newsyslog [netbsd-5-0]: newsyslog.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #925):
usr.bin/newsyslog/newsyslog.c: revision 1.59
Reset ziptype on each line. Failure to do this caused any log file to
be compressed if it was listed after a line using Z or J flag. For
instance, we compressed log2 with the config file below:
/var/log/log1600 5100 *Z
/var/log/log2600 7100 *-
To generate a diff of this commit:
cvs rdiff -u -r1.53.10.1 -r1.53.10.1.2.1 src/usr.bin/newsyslog/newsyslog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/newsyslog/newsyslog.c
diff -u src/usr.bin/newsyslog/newsyslog.c:1.53.10.1 src/usr.bin/newsyslog/newsyslog.c:1.53.10.1.2.1
--- src/usr.bin/newsyslog/newsyslog.c:1.53.10.1 Tue Feb 24 02:47:30 2009
+++ src/usr.bin/newsyslog/newsyslog.c Sat Sep 5 12:58:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: newsyslog.c,v 1.53.10.1 2009/02/24 02:47:30 snj Exp $ */
+/* $NetBSD: newsyslog.c,v 1.53.10.1.2.1 2009/09/05 12:58:29 bouyer Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran a...@netbsd.org
@@ -55,7 +55,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: newsyslog.c,v 1.53.10.1 2009/02/24 02:47:30 snj Exp $);
+__RCSID($NetBSD: newsyslog.c,v 1.53.10.1.2.1 2009/09/05 12:58:29 bouyer Exp $);
#endif /* not lint */
#include sys/types.h
@@ -246,6 +246,7 @@
rv = -1;
line = NULL;
+ ziptype = 0;
/* Place the white-space separated fields into an array. */
do {
CVS commit: [netbsd-5-0] src/usr.bin/netstat
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:05:37 UTC 2009 Modified Files: src/usr.bin/netstat [netbsd-5-0]: netstat.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #933): usr.bin/netstat/netstat.1: revision 1.52 Fix typo To generate a diff of this commit: cvs rdiff -u -r1.48.12.1 -r1.48.12.1.2.1 src/usr.bin/netstat/netstat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/netstat/netstat.1 diff -u src/usr.bin/netstat/netstat.1:1.48.12.1 src/usr.bin/netstat/netstat.1:1.48.12.1.2.1 --- src/usr.bin/netstat/netstat.1:1.48.12.1 Mon Feb 23 08:43:12 2009 +++ src/usr.bin/netstat/netstat.1 Sat Sep 5 13:05:37 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: netstat.1,v 1.48.12.1 2009/02/23 08:43:12 snj Exp $ +.\ $NetBSD: netstat.1,v 1.48.12.1.2.1 2009/09/05 13:05:37 bouyer Exp $ .\ .\ Copyright (c) 1983, 1990, 1992, 1993 .\ The Regents of the University of California. All rights reserved. @@ -290,7 +290,7 @@ or ``wildcard'', addresses and ports appear as ``*''. You can use the .Xr fstat 1 -to find out which process or processes hold references to a socket. +command to find out which process or processes hold references to a socket. .Pp The interface display provides a table of cumulative statistics regarding packets transferred, errors, and collisions.
CVS commit: [netbsd-5-0] src/usr.bin/chflags
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:06:35 UTC 2009 Modified Files: src/usr.bin/chflags [netbsd-5-0]: chflags.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #934): usr.bin/chflags/chflags.1: revision 1.18 Add some markup to improve clarity. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.44.1 src/usr.bin/chflags/chflags.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/chflags/chflags.1 diff -u src/usr.bin/chflags/chflags.1:1.17 src/usr.bin/chflags/chflags.1:1.17.44.1 --- src/usr.bin/chflags/chflags.1:1.17 Thu Aug 7 11:13:16 2003 +++ src/usr.bin/chflags/chflags.1 Sat Sep 5 13:06:35 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: chflags.1,v 1.17 2003/08/07 11:13:16 agc Exp $ +.\ $NetBSD: chflags.1,v 1.17.44.1 2009/09/05 13:06:35 bouyer Exp $ .\ .\ Copyright (c) 1989, 1990, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -72,7 +72,11 @@ option is specified, no symbolic links are followed. .It Fl R Change the file flags for the file hierarchies rooted -in the files instead of just the files themselves. +in the +.Ar files +instead of just the +.Ar files +themselves. .It Fl h If the .Ar file
CVS commit: [netbsd-5-0] src/sys/dev/acpi
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 13:10:18 UTC 2009
Modified Files:
src/sys/dev/acpi [netbsd-5-0]: pckbc_acpi.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #939):
sys/dev/acpi/pckbc_acpi.c: revision 1.32
PR# port-i386/39671: panic while booting with an acpi kernel on a 790GX board
If the firmware describes duplicate keyboard controller nodes, don't panic
when the driver fails to map registers.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.10.1 src/sys/dev/acpi/pckbc_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/pckbc_acpi.c
diff -u src/sys/dev/acpi/pckbc_acpi.c:1.30 src/sys/dev/acpi/pckbc_acpi.c:1.30.10.1
--- src/sys/dev/acpi/pckbc_acpi.c:1.30 Tue Sep 16 11:24:55 2008
+++ src/sys/dev/acpi/pckbc_acpi.c Sat Sep 5 13:10:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.30 2008/09/16 11:24:55 pgoyette Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.30.10.1 2009/09/05 13:10:18 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pckbc_acpi.c,v 1.30 2008/09/16 11:24:55 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: pckbc_acpi.c,v 1.30.10.1 2009/09/05 13:10:18 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -207,8 +207,11 @@
if (bus_space_map(aa-aa_iot, io0-ar_base,
io0-ar_length, 0, ioh_d) ||
bus_space_map(aa-aa_iot, io1-ar_base,
- io1-ar_length, 0, ioh_c))
-panic(pckbc_acpi_attach: couldn't map);
+ io1-ar_length, 0, ioh_c)) {
+aprint_error_dev(self,
+unable to map registers\n);
+goto out;
+ }
t = malloc(sizeof(struct pckbc_internal),
M_DEVBUF, M_WAITOK|M_ZERO);
@@ -229,9 +232,11 @@
first-sc_pckbc.intr_establish = pckbc_acpi_intr_establish;
config_defer(first-sc_pckbc.sc_dv, pckbc_acpi_finish_attach);
- } else if (!pmf_device_register(self, NULL, NULL))
+ }
+
+out:
+ if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, couldn't establish power handler\n);
- out:
acpi_resource_cleanup(res);
}
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:18:33 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Tickets 925, 933, 934, 939 To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.9 src/doc/CHANGES-5.0.2:1.1.2.10 --- src/doc/CHANGES-5.0.2:1.1.2.9 Sat Sep 5 11:46:58 2009 +++ src/doc/CHANGES-5.0.2 Sat Sep 5 13:18:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.9 2009/09/05 11:46:58 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.10 2009/09/05 13:18:33 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -202,3 +202,27 @@ Patch supplied by Pierre Pronchery in PR bin/41490. [tron, ticket #914] +usr.bin/newsyslog/newsyslog.c 1.59 + + Reset ziptype on each line. Failure to do this caused any log file to + be compressed if it was listed after a line using Z or J flag. + [manu, ticket #925] + +usr.bin/netstat/netstat.1 1.52 + + Fix typo + [dholland, ticket #933] + +usr.bin/chflags/chflags.1 1.18 + + Add some markup to improve clarity. + [dholland, ticket #934] + +sys/dev/acpi/pckbc_acpi.c 1.32 + + PR# port-i386/39671: panic while booting with an acpi kernel on a + 790GX board + If the firmware describes duplicate keyboard controller nodes, + don't panic when the driver fails to map registers. + [jmcneill, ticket #939] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sat Sep 5 16:24:20 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Fix a small formatting issue with ticket 914. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.10 src/doc/CHANGES-5.0.2:1.1.2.11 --- src/doc/CHANGES-5.0.2:1.1.2.10 Sat Sep 5 13:18:33 2009 +++ src/doc/CHANGES-5.0.2 Sat Sep 5 16:24:20 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.10 2009/09/05 13:18:33 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.11 2009/09/05 16:24:20 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -198,7 +198,7 @@ sbin/fsck_ext2fs/main.c1.33 Ignore the -P option as intended to make this work with e.g. - fsck_flags=3D-pP in /etc/rc.conf. + fsck_flags=-pP in /etc/rc.conf. Patch supplied by Pierre Pronchery in PR bin/41490. [tron, ticket #914]
CVS commit: [netbsd-5-0] src/etc/ssh
Module Name:src Committed By: snj Date: Sun Aug 30 02:47:08 UTC 2009 Modified Files: src/etc/ssh [netbsd-5-0]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #930): etc/ssh/ssh_known_hosts: revision 1.5 add morden, mollari, pkgbuild and build adjust function names' keys add the proper names of hosts too in preparation of their function moving To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.30.1 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.4 src/etc/ssh/ssh_known_hosts:1.4.30.1 --- src/etc/ssh/ssh_known_hosts:1.4 Tue Sep 26 21:57:06 2006 +++ src/etc/ssh/ssh_known_hosts Sun Aug 30 02:47:07 2009 @@ -1,12 +1,27 @@ -# $NetBSD: ssh_known_hosts,v 1.4 2006/09/26 21:57:06 tron Exp $ +# $NetBSD: ssh_known_hosts,v 1.4.30.1 2009/08/30 02:47:07 snj Exp $ # -anoncvs.netbsd.org 1024 33 124527836847225907702134616704062642655823674633646867489991942489052722003567896405835432181052901730304969527126160762854542328265293874791858398238222787853274712973179184350617008506840396224723739301126809289775083202762136105883911120059428253653584248682397589937086051061126544879545951581690785060623 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= -cvs.netbsd.org,cvs4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= -ftp.netbsd.org,ftp4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s= + +pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= + +build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= + +blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +garibaldi.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA7CW/T6MxwXi2qAQSGnSRXqwlwhrKsKVj3VKbsPpFf3fg28259fpqBYHgE4qWlhxg/wEtHoMaxRee1H3KaQwj88ez4fYMgDRkDgFY+NlwII/vgeFFKvjZvzsmfLP75uXC9YS/AlagHmIeubu4ymlgQ29fpwacKmrgCLTrEIXMHPc= + +babylon5.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= + +morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= + +narn.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sun Aug 30 02:51:25 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 930. To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.7 src/doc/CHANGES-5.0.2:1.1.2.8 --- src/doc/CHANGES-5.0.2:1.1.2.7 Tue Aug 25 19:11:24 2009 +++ src/doc/CHANGES-5.0.2 Sun Aug 30 02:51:25 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.7 2009/08/25 19:11:24 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.8 2009/08/30 02:51:25 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -183,3 +183,8 @@ as a bluetooth device [plunky, ticket #926] +etc/ssh/ssh_known_hosts1.5 + + Update and add some TNF ssh keys. + [spz, ticket #930] +
CVS commit: [netbsd-5-0] src/sys/arch/macppc/dev
Module Name:src
Committed By: snj
Date: Tue Aug 25 18:29:14 UTC 2009
Modified Files:
src/sys/arch/macppc/dev [netbsd-5-0]: pbms.c
Log Message:
Pull up following revision(s) (requested by aymeric in ticket #916):
sys/arch/macppc/dev/pbms.c: revision 1.8
. use device_private() (led to immediate crash during attach)
. while there, fix the aspect ratio of the trackpad on the geyser2 model
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.36.1 src/sys/arch/macppc/dev/pbms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/pbms.c
diff -u src/sys/arch/macppc/dev/pbms.c:1.7 src/sys/arch/macppc/dev/pbms.c:1.7.36.1
--- src/sys/arch/macppc/dev/pbms.c:1.7 Wed Oct 17 19:55:19 2007
+++ src/sys/arch/macppc/dev/pbms.c Tue Aug 25 18:29:14 2009
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.7 2007/10/17 19:55:19 garbled Exp $ */
+/* $Id: pbms.c,v 1.7.36.1 2009/08/25 18:29:14 snj Exp $ */
/*
* Copyright (c) 2005, Johan Wallén
@@ -243,7 +243,7 @@
/* 15 inch PowerBooks */
POWERBOOK_TOUCHPAD(15, 0x020e, 85, 16, 57), /* XXX Not tested. */
POWERBOOK_TOUCHPAD(15, 0x020f, 85, 16, 57),
- POWERBOOK_TOUCHPAD(15, 0x0215, 64, 16, 43),
+ POWERBOOK_TOUCHPAD(15, 0x0215, 90, 15, 107),
/* 17 inch PowerBooks */
POWERBOOK_TOUCHPAD(17, 0x020d, 71, 26, 68) /* XXX Not tested. */
#undef POWERBOOK_TOUCHPAD
@@ -348,7 +348,7 @@
struct wsmousedev_attach_args a;
struct uhidev_attach_arg *uha = aux;
struct pbms_dev *pd;
- struct pbms_softc *sc = (struct pbms_softc *)self;
+ struct pbms_softc *sc = device_private(self);
usb_device_descriptor_t *udd;
int i;
uint16_t vendor, product;
@@ -374,11 +374,10 @@
sc-sc_x_sensors = pd-x_sensors;
sc-sc_y_factor = pd-y_factor;
sc-sc_y_sensors = pd-y_sensors;
-if (product == 0x215) {
+if (product == 0x0215) {
sc-is_geyser2 = 1;
- sc-sc_x_sensors = 15;
- sc-sc_y_sensors = 9;
sc-sc_datalen = 64;
+ sc-sc_y_sensors = 9;
}
break;
}
CVS commit: [netbsd-5-0] src/sbin/tunefs
Module Name:src Committed By: snj Date: Tue Aug 25 18:36:08 UTC 2009 Modified Files: src/sbin/tunefs [netbsd-5-0]: tunefs.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #917): sbin/tunefs/tunefs.c: revision 1.40 fix pasto: UFS_WAPBL_FLAGS_CREATE_LOG is create-log not clear-log To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.37.6.1 src/sbin/tunefs/tunefs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/tunefs/tunefs.c diff -u src/sbin/tunefs/tunefs.c:1.37 src/sbin/tunefs/tunefs.c:1.37.6.1 --- src/sbin/tunefs/tunefs.c:1.37 Thu Jul 31 15:55:41 2008 +++ src/sbin/tunefs/tunefs.c Tue Aug 25 18:36:08 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: tunefs.c,v 1.37 2008/07/31 15:55:41 simonb Exp $ */ +/* $NetBSD: tunefs.c,v 1.37.6.1 2009/08/25 18:36:08 snj Exp $ */ /* * Copyright (c) 1983, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = @(#)tunefs.c 8.3 (Berkeley) 5/3/95; #else -__RCSID($NetBSD: tunefs.c,v 1.37 2008/07/31 15:55:41 simonb Exp $); +__RCSID($NetBSD: tunefs.c,v 1.37.6.1 2009/08/25 18:36:08 snj Exp $); #endif #endif /* not lint */ @@ -345,7 +345,7 @@ printf(\n); printf(\tjournal log flags:); if (sblock.fs_journal_flags UFS_WAPBL_FLAGS_CREATE_LOG) - printf( clear-log); + printf( create-log); if (sblock.fs_journal_flags UFS_WAPBL_FLAGS_CLEAR_LOG) printf( clear-log); printf(\n);
CVS commit: [netbsd-5-0] src/sys/arch/hpcmips/vr
Module Name:src
Committed By: snj
Date: Tue Aug 25 18:41:12 UTC 2009
Modified Files:
src/sys/arch/hpcmips/vr [netbsd-5-0]: vr.c
Log Message:
Pull up following revision(s) (requested by jun in ticket #918):
sys/arch/hpcmips/vr/vr.c: revision 1.54
Fix #41863, Missing }.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.20.1 src/sys/arch/hpcmips/vr/vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.51 src/sys/arch/hpcmips/vr/vr.c:1.51.20.1
--- src/sys/arch/hpcmips/vr/vr.c:1.51 Fri Apr 4 12:36:06 2008
+++ src/sys/arch/hpcmips/vr/vr.c Tue Aug 25 18:41:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.51 2008/04/04 12:36:06 tsutsui Exp $ */
+/* $NetBSD: vr.c,v 1.51.20.1 2009/08/25 18:41:12 snj Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.51 2008/04/04 12:36:06 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.51.20.1 2009/08/25 18:41:12 snj Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -428,6 +428,7 @@
printf(%s(%d): can't init kgdb's serial port,
__FILE__, __LINE__);
}
+ }
#else /* KGDB */
if (com_info-attach != NULL (bootinfo-bi_cnuseBI_CNUSE_SERIAL)) {
/* Serial console */
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Tue Aug 25 19:11:24 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Pull up following revision(s) (requested by plunky in ticket #926): share/man/man4/btuart.4: revision 1.9 share/man/man4/bcsp.4: revision 1.5 make a small mention how to configure the tty line as a bluetooth device To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.6 src/doc/CHANGES-5.0.2:1.1.2.7 --- src/doc/CHANGES-5.0.2:1.1.2.6 Sun Aug 16 22:42:16 2009 +++ src/doc/CHANGES-5.0.2 Tue Aug 25 19:11:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.6 2009/08/16 22:42:16 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.7 2009/08/25 19:11:24 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -63,7 +63,7 @@ usr.bin/gencat/gencat.c1.30 Rename internal getline() function to get_line() so it does - conflict with -current's getline(3) libc function. + not conflict with -current's getline(3) libc function. [roy, ticket #885] sbin/ifconfig/parse.c1.14 @@ -153,3 +153,33 @@ Received from OpenBSD via US-CERT as VU #590371. [christos, ticket #915] +sys/arch/macppc/dev/pbms.c 1.8 + + - Use device_private() (led to immediate crash during attach) + - While there, fix the aspect ratio of the trackpad on the + geyser2 model + [aymeric, ticket #916] + +sbin/tunefs/tunefs.c1.40 + + Fix pasto: UFS_WAPBL_FLAGS_CREATE_LOG is create-log not + clear-log + [bouyer, ticket #917] + +sys/arch/hpcmips/vr/vr.c 1.54 + + Fix PR port-hpcmips/41863, Missing }. + [jun, ticket #918] + +usr.bin/mixerctl/mixerctl.1 1.24 + + Fix markup. + [joerg, ticket #919] + +share/man/man4/bcsp.41.4, 1.5 +share/man/man4/btuart.41.7-1.9 + + Fix some small nits and mention how to configure the tty line + as a bluetooth device + [plunky, ticket #926] +
CVS commit: [netbsd-5-0] src/share/man/man4
Module Name:src Committed By: snj Date: Tue Aug 25 19:03:09 UTC 2009 Modified Files: src/share/man/man4 [netbsd-5-0]: btuart.4 Log Message: Pull up following revision(s) (requested by plunky in ticket #926): share/man/man4/btuart.4: revision 1.8 Ficks some spelling mistakes and tyops. To generate a diff of this commit: cvs rdiff -u -r1.6.10.1 -r1.6.10.2 src/share/man/man4/btuart.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/btuart.4 diff -u src/share/man/man4/btuart.4:1.6.10.1 src/share/man/man4/btuart.4:1.6.10.2 --- src/share/man/man4/btuart.4:1.6.10.1 Tue Aug 25 19:02:24 2009 +++ src/share/man/man4/btuart.4 Tue Aug 25 19:03:09 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: btuart.4,v 1.6.10.1 2009/08/25 19:02:24 snj Exp $ +.\ $NetBSD: btuart.4,v 1.6.10.2 2009/08/25 19:03:09 snj Exp $ .\ .\ Copyright (c) 2007 KIYOHARA Takashi .\ All rights reserved. @@ -51,7 +51,7 @@ .Sh HISTORY The .Nm -driver was written with refererence to the BlueZ drivers +driver was written with reference to the BlueZ drivers for Linux, and first appeared in .Nx 5.0 . .Sh AUTHORS
CVS commit: [netbsd-5-0] src/share/man/man4
Module Name:src Committed By: snj Date: Tue Aug 25 19:04:27 UTC 2009 Modified Files: src/share/man/man4 [netbsd-5-0]: bcsp.4 btuart.4 Log Message: Pull up following revision(s) (requested by plunky in ticket #926): share/man/man4/bcsp.4: revision 1.5 share/man/man4/btuart.4: revision 1.9 make a small mention how to configure the tty line as a bluetooth device To generate a diff of this commit: cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/share/man/man4/bcsp.4 cvs rdiff -u -r1.6.10.2 -r1.6.10.3 src/share/man/man4/btuart.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/bcsp.4 diff -u src/share/man/man4/bcsp.4:1.3.10.1 src/share/man/man4/bcsp.4:1.3.10.2 --- src/share/man/man4/bcsp.4:1.3.10.1 Tue Aug 25 19:03:39 2009 +++ src/share/man/man4/bcsp.4 Tue Aug 25 19:04:27 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: bcsp.4,v 1.3.10.1 2009/08/25 19:03:39 snj Exp $ +.\ $NetBSD: bcsp.4,v 1.3.10.2 2009/08/25 19:04:27 snj Exp $ .\ .\ Copyright (c) 2007 KIYOHARA Takashi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 2, 2007 +.Dd August 23, 2009 .Dt BCSP 4 .Os .Sh NAME @@ -47,6 +47,12 @@ supports BCSP Link Establishment Protocol, as described in the .Qq BCSP Link Establishment Protocol specification. +.Pp +The +.Xr btattach 8 +program is used to configure the tty line and create the +.Nm +driver instance. .Sh SEE ALSO .Xr bluetooth 4 , .Xr btuart 4 , @@ -59,6 +65,5 @@ .Sh AUTHORS .An KIYOHARA Takashi Aq kiyoh...@kk.iij4u.or.jp .Sh BUGS -The .Nm -not support configuration for baud rate yet. +does not support configuration for baud rate yet. Index: src/share/man/man4/btuart.4 diff -u src/share/man/man4/btuart.4:1.6.10.2 src/share/man/man4/btuart.4:1.6.10.3 --- src/share/man/man4/btuart.4:1.6.10.2 Tue Aug 25 19:03:09 2009 +++ src/share/man/man4/btuart.4 Tue Aug 25 19:04:27 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: btuart.4,v 1.6.10.2 2009/08/25 19:03:09 snj Exp $ +.\ $NetBSD: btuart.4,v 1.6.10.3 2009/08/25 19:04:27 snj Exp $ .\ .\ Copyright (c) 2007 KIYOHARA Takashi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 23, 2008 +.Dd August 23, 2009 .Dt BTUART 4 .Os .Sh NAME @@ -44,6 +44,12 @@ .Bq Transport Layer specification, Vol 4 part A. .Qc +.Pp +The +.Xr btattach 8 +program is used to configure the tty line and create the +.Nm +driver instance. .Sh SEE ALSO .Xr bcsp 4 , .Xr bluetooth 4 ,
CVS commit: [netbsd-5-0] src/lib/libc/gen
Module Name:src
Committed By: bouyer
Date: Sun Aug 16 22:41:17 UTC 2009
Modified Files:
src/lib/libc/gen [netbsd-5-0]: fts.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #915):
lib/libc/gen/fts.c: revision 1.38
Avoid possible integer overflow and subsequent collateral damage.
Received from OpenBSD via US-CERT as VU #590371.
Original OpenBSD commit log:
revision 1.42
date: 2009/02/11 13:24:05; author: otto; state: Exp; lines: +9 -1
Avoid level going negative on deep (i mean really deep) dirs. Reported
by Maksymilian Arciemowicz. ok kettenis@ millert@
To generate a diff of this commit:
cvs rdiff -u -r1.34.4.1 -r1.34.4.1.2.1 src/lib/libc/gen/fts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/fts.c
diff -u src/lib/libc/gen/fts.c:1.34.4.1 src/lib/libc/gen/fts.c:1.34.4.1.2.1
--- src/lib/libc/gen/fts.c:1.34.4.1 Thu Jan 8 22:00:34 2009
+++ src/lib/libc/gen/fts.c Sun Aug 16 22:41:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fts.c,v 1.34.4.1 2009/01/08 22:00:34 snj Exp $ */
+/* $NetBSD: fts.c,v 1.34.4.1.2.1 2009/08/16 22:41:16 bouyer Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = @(#)fts.c 8.6 (Berkeley) 8/14/94;
#else
-__RCSID($NetBSD: fts.c,v 1.34.4.1 2009/01/08 22:00:34 snj Exp $);
+__RCSID($NetBSD: fts.c,v 1.34.4.1.2.1 2009/08/16 22:41:16 bouyer Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -726,6 +726,14 @@
len++;
maxlen = sp-fts_pathlen - len;
+ if (cur-fts_level == SHRT_MAX) {
+ (void)closedir(dirp);
+ cur-fts_info = FTS_ERR;
+ SET(FTS_STOP);
+ errno = ENAMETOOLONG;
+ return (NULL);
+ }
+
level = cur-fts_level + 1;
/* Read the directory, attaching each entry to the `link' pointer. */
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Aug 16 22:42:16 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: ticket 915 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.5 src/doc/CHANGES-5.0.2:1.1.2.6 --- src/doc/CHANGES-5.0.2:1.1.2.5 Sun Aug 16 00:21:49 2009 +++ src/doc/CHANGES-5.0.2 Sun Aug 16 22:42:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.5 2009/08/16 00:21:49 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.6 2009/08/16 22:42:16 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -146,3 +146,10 @@ period to the register. [bouyer, ticket #912] +lib/libc/gen/fts.c1.38 + + Avoid possible integer overflow on really deep dirs, + and subsequent collateral damage. + Received from OpenBSD via US-CERT as VU #590371. + [christos, ticket #915] +
CVS commit: [netbsd-5-0] src/lib/libc/gdtoa
Module Name:src
Committed By: snj
Date: Sun Aug 16 00:13:50 UTC 2009
Modified Files:
src/lib/libc/gdtoa [netbsd-5-0]: gdtoaimp.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #913):
lib/libc/gdtoa/gdtoaimp.h: revision 1.7
Change Kmax so we allocate enough freelist entries to handle large field
numbers. Reported by Maksymilian Arciemowicz
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.24.1 src/lib/libc/gdtoa/gdtoaimp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gdtoa/gdtoaimp.h
diff -u src/lib/libc/gdtoa/gdtoaimp.h:1.6 src/lib/libc/gdtoa/gdtoaimp.h:1.6.24.1
--- src/lib/libc/gdtoa/gdtoaimp.h:1.6 Sat Feb 3 16:44:02 2007
+++ src/lib/libc/gdtoa/gdtoaimp.h Sun Aug 16 00:13:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gdtoaimp.h,v 1.6 2007/02/03 16:44:02 christos Exp $ */
+/* $NetBSD: gdtoaimp.h,v 1.6.24.1 2009/08/16 00:13:50 snj Exp $ */
/
@@ -489,7 +489,7 @@
} while (/* CONSTCOND */ 0)
#endif
-#define Kmax 15
+#define Kmax (sizeof(size_t) 3)
struct
Bigint {
CVS commit: [netbsd-5-0] src/sys/arch/x86/pci
Module Name:src
Committed By: snj
Date: Sun Aug 16 00:17:46 UTC 2009
Modified Files:
src/sys/arch/x86/pci [netbsd-5-0]: ichlpcib.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #912):
sys/arch/x86/pci/ichlpcib.c: revision 1.18
Fix watchdog code:
- the timer bound constants are in tick, so convert period to tick before
checking it against the bounds
- for ICH5 or older, fix code that would have always written a 0 period
to the register.
To generate a diff of this commit:
cvs rdiff -u -r1.14.4.1 -r1.14.4.1.2.1 src/sys/arch/x86/pci/ichlpcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.14.4.1 src/sys/arch/x86/pci/ichlpcib.c:1.14.4.1.2.1
--- src/sys/arch/x86/pci/ichlpcib.c:1.14.4.1 Tue Apr 7 23:28:30 2009
+++ src/sys/arch/x86/pci/ichlpcib.c Sun Aug 16 00:17:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.14.4.1 2009/04/07 23:28:30 snj Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.14.4.1.2.1 2009/08/16 00:17:46 snj Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.14.4.1 2009/04/07 23:28:30 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.14.4.1.2.1 2009/08/16 00:17:46 snj Exp $);
#include sys/types.h
#include sys/param.h
@@ -413,6 +413,7 @@
struct lpcib_softc *sc = smw-smw_cookie;
unsigned int period;
uint16_t ich6period = 0;
+ uint8_t ich5period = 0;
if ((smw-smw_mode WDOG_MODE_MASK) == WDOG_MODE_DISARMED) {
/* Stop the TCO timer. */
@@ -422,16 +423,16 @@
* ICH6 or newer are limited to 2s min and 613s max.
* ICH5 or older are limited to 4s min and 39s max.
*/
+ period = lpcib_tcotimer_second_to_tick(smw-smw_period);
if (sc-sc_has_rcba) {
- if (smw-smw_period LPCIB_TCOTIMER2_MIN_TICK ||
- smw-smw_period LPCIB_TCOTIMER2_MAX_TICK)
+ if (period LPCIB_TCOTIMER2_MIN_TICK ||
+ period LPCIB_TCOTIMER2_MAX_TICK)
return EINVAL;
} else {
- if (smw-smw_period LPCIB_TCOTIMER_MIN_TICK ||
- smw-smw_period LPCIB_TCOTIMER_MAX_TICK)
+ if (period LPCIB_TCOTIMER_MIN_TICK ||
+ period LPCIB_TCOTIMER_MAX_TICK)
return EINVAL;
}
- period = lpcib_tcotimer_second_to_tick(smw-smw_period);
/* Stop the TCO timer, */
tcotimer_stop(sc);
@@ -446,11 +447,11 @@
LPCIB_TCO_TMR2, ich6period | period);
} else {
/* ICH5 or older */
- period |= bus_space_read_1(sc-sc_iot, sc-sc_ioh,
+ ich5period = bus_space_read_1(sc-sc_iot, sc-sc_ioh,
LPCIB_TCO_TMR);
- period = 0xc0;
+ ich5period = 0xc0;
bus_space_write_1(sc-sc_iot, sc-sc_ioh,
- LPCIB_TCO_TMR, period);
+ LPCIB_TCO_TMR, ich5period | period);
}
/* and start/reload the timer. */
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sun Aug 16 00:21:49 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Tickets 912 and 913. To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.4 src/doc/CHANGES-5.0.2:1.1.2.5 --- src/doc/CHANGES-5.0.2:1.1.2.4 Fri Aug 14 22:11:37 2009 +++ src/doc/CHANGES-5.0.2 Sun Aug 16 00:21:49 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.4 2009/08/14 22:11:37 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.5 2009/08/16 00:21:49 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -131,3 +131,18 @@ PR port-hpcmips/41164. [jun, ticket #899] +lib/libc/gdtoa/gdtoaimp.h 1.7 + + Change Kmax so we allocate enough freelist entries to handle + large field numbers. + [christos, ticket #913] + +sys/arch/x86/pci/ichlpcib.c 1.18 + + Fix watchdog code: + - the timer bound constants are in tick, so convert period to + tick before checking it against the bounds + - for ICH5 or older, fix code that would have always written a 0 + period to the register. + [bouyer, ticket #912] +
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: snj
Date: Fri Aug 14 20:39:04 UTC 2009
Modified Files:
src/bin/pax [netbsd-5-0]: options.c
src/dist/nawk [netbsd-5-0]: maketab.c proctab.c proto.h run.c
src/usr.bin/ctags [netbsd-5-0]: C.c ctags.h fortran.c lisp.c print.c
yacc.c
src/usr.bin/gencat [netbsd-5-0]: gencat.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #885):
bin/pax/options.c: revision 1.105
dist/nawk/maketab.c: revision 1.12
dist/nawk/proctab.c: revision 1.11
dist/nawk/proto.h: revision 1.9
dist/nawk/run.c: revision 1.29
usr.bin/ctags/C.c: revision 1.19
usr.bin/ctags/ctags.h: revision 1.9
usr.bin/ctags/fortran.c: revision 1.11
usr.bin/ctags/lisp.c: revision 1.11
usr.bin/ctags/print.c: revision 1.10
usr.bin/ctags/yacc.c: revision 1.12
usr.bin/gencat/gencat.c: revision 1.30
Rename internal getline() function to get_line() so it does
conflict with the soon to be added getline(3) libc function.
To generate a diff of this commit:
cvs rdiff -u -r1.101.12.2 -r1.101.12.2.2.1 src/bin/pax/options.c
cvs rdiff -u -r1.11 -r1.11.6.1 src/dist/nawk/maketab.c
cvs rdiff -u -r1.10 -r1.10.6.1 src/dist/nawk/proctab.c
cvs rdiff -u -r1.6.12.1 -r1.6.12.1.2.1 src/dist/nawk/proto.h
cvs rdiff -u -r1.25 -r1.25.6.1 src/dist/nawk/run.c
cvs rdiff -u -r1.15 -r1.15.32.1 src/usr.bin/ctags/C.c
cvs rdiff -u -r1.8 -r1.8.38.1 src/usr.bin/ctags/ctags.h
cvs rdiff -u -r1.10 -r1.10.38.1 src/usr.bin/ctags/fortran.c \
src/usr.bin/ctags/lisp.c
cvs rdiff -u -r1.9 -r1.9.38.1 src/usr.bin/ctags/print.c
cvs rdiff -u -r1.11 -r1.11.32.1 src/usr.bin/ctags/yacc.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/usr.bin/gencat/gencat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.101.12.2 src/bin/pax/options.c:1.101.12.2.2.1
--- src/bin/pax/options.c:1.101.12.2 Mon Apr 13 20:42:59 2009
+++ src/bin/pax/options.c Fri Aug 14 20:39:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.101.12.2 2009/04/13 20:42:59 snj Exp $ */
+/* $NetBSD: options.c,v 1.101.12.2.2.1 2009/08/14 20:39:03 snj Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)options.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: options.c,v 1.101.12.2 2009/04/13 20:42:59 snj Exp $);
+__RCSID($NetBSD: options.c,v 1.101.12.2.2.1 2009/08/14 20:39:03 snj Exp $);
#endif
#endif /* not lint */
@@ -85,7 +85,7 @@
static void printflg(unsigned int);
static int c_frmt(const void *, const void *);
static off_t str_offt(char *);
-static char *getline(FILE *fp);
+static char *get_line(FILE *fp);
static void pax_options(int, char **);
static void pax_usage(void);
static void tar_options(int, char **);
@@ -95,10 +95,10 @@
static void cpio_usage(void);
#endif
-/* errors from getline */
+/* errors from get_line */
#define GETLINE_FILE_CORRUPT 1
#define GETLINE_OUT_OF_MEM 2
-static int getline_error;
+static int get_line_error;
#define BZIP2_CMD bzip2 /* command to run as bzip2 */
#define GZIP_CMD gzip /* command to run as gzip */
@@ -1210,7 +1210,7 @@
tty_warn(1, Unable to open file '%s' for read, file);
tar_usage();
}
- while ((str = getline(fp)) != NULL) {
+ while ((str = get_line(fp)) != NULL) {
if (dirisnext) {
if (dir mustfreedir)
free(dir);
@@ -1245,7 +1245,7 @@
free(dir);
if (strcmp(file, -) != 0)
fclose(fp);
- if (getline_error) {
+ if (get_line_error) {
tty_warn(1, Problem with file '%s', file);
tar_usage();
}
@@ -1315,7 +1315,7 @@
tty_warn(1, Unable to open file '%s' for read, file);
tar_usage();
}
-while ((str = getline(fp)) != NULL) {
+while ((str = get_line(fp)) != NULL) {
if (dirisnext) {
if (ftree_add(str, 1) 0)
tar_usage();
@@ -1339,7 +1339,7 @@
tar_usage();
if (strcmp(file, -) != 0)
fclose(fp);
-if (getline_error) {
+if (get_line_error) {
tty_warn(1, Problem with file '%s',
file);
tar_usage();
@@ -1640,11 +1640,11 @@
optarg);
cpio_usage();
}
- while ((str = getline(fp)) != NULL) {
+ while ((str = get_line(fp)) != NULL) {
pat_add(str, NULL, 0);
}
fclose(fp);
- if (getline_error) {
+ if (get_line_error) {
tty_warn(1, Problem with file '%s', optarg);
cpio_usage();
}
@@ -1803,10 +1803,10 @@
* no read errors allowed on updates/append operation!
*/
maxflt = 0;
- while ((str = getline(stdin)) != NULL) {
+ while ((str = get_line(stdin)) != NULL) {
ftree_add(str, 0);
}
- if (getline_error) {
+ if (get_line_error) {
tty_warn(1, Problem while reading stdin);
cpio_usage();
}
@@ -2034,21 +2034,21 @@
}
char *
-getline(FILE *f)
+get_line(FILE *f)
{
CVS commit: [netbsd-5-0] src/sbin/ifconfig
Module Name:src Committed By: snj Date: Fri Aug 14 20:44:06 UTC 2009 Modified Files: src/sbin/ifconfig [netbsd-5-0]: parse.c Log Message: Pull up following revision(s) (requested by dyoung in ticket #878): sbin/ifconfig/parse.c: revision 1.14 Both carp.c and vlan.c expect for a keyword with a KW_T_STR-type value to put a prop_string_t into the environment, but the keyword parser put a prop_data_t into the environment, instead. That broke the -vlanif and -carpdev keywords and defied developer expectations. Let's put a prop_string_t into the environment. Thanks to Arnaud Degroote for reporting the problem. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.4.1 src/sbin/ifconfig/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ifconfig/parse.c diff -u src/sbin/ifconfig/parse.c:1.12 src/sbin/ifconfig/parse.c:1.12.4.1 --- src/sbin/ifconfig/parse.c:1.12 Fri Aug 1 22:29:14 2008 +++ src/sbin/ifconfig/parse.c Fri Aug 14 20:44:06 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.12 2008/08/01 22:29:14 dyoung Exp $ */ +/* $NetBSD: parse.c,v 1.12.4.1 2009/08/14 20:44:06 snj Exp $ */ /*- * Copyright (c) 2008 David Young. All rights reserved. @@ -27,7 +27,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: parse.c,v 1.12 2008/08/01 22:29:14 dyoung Exp $); +__RCSID($NetBSD: parse.c,v 1.12.4.1 2009/08/14 20:44:06 snj Exp $); #endif /* not lint */ #include err.h @@ -685,8 +685,7 @@ o = u-u_obj; break; case KW_T_STR: - o = (prop_object_t)prop_data_create_data_nocopy(u-u_str, - strlen(u-u_str)); + o = (prop_object_t)prop_string_create_cstring_nocopy(u-u_str); if (o == NULL) goto err; break;
CVS commit: [netbsd-5-0] src/sbin/ifconfig
Module Name:src
Committed By: snj
Date: Fri Aug 14 20:46:13 UTC 2009
Modified Files:
src/sbin/ifconfig [netbsd-5-0]: vlan.c
Log Message:
Pull up following revision(s) (requested by dyoung in ticket #879):
sbin/ifconfig/vlan.c: revision 1.13
Don't require a vlan argument with -vlanif. ifconfig vlan0
-vlanif works as one would expect, now.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.6.1 src/sbin/ifconfig/vlan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/vlan.c
diff -u src/sbin/ifconfig/vlan.c:1.12 src/sbin/ifconfig/vlan.c:1.12.6.1
--- src/sbin/ifconfig/vlan.c:1.12 Tue Jul 15 21:27:58 2008
+++ src/sbin/ifconfig/vlan.c Fri Aug 14 20:46:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vlan.c,v 1.12 2008/07/15 21:27:58 dyoung Exp $ */
+/* $NetBSD: vlan.c,v 1.12.6.1 2009/08/14 20:46:13 snj Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: vlan.c,v 1.12 2008/07/15 21:27:58 dyoung Exp $);
+__RCSID($NetBSD: vlan.c,v 1.12.6.1 2009/08/14 20:46:13 snj Exp $);
#endif /* not lint */
#include sys/param.h
@@ -140,17 +140,17 @@
if (getvlan(env, vlr, false) == -1)
err(EXIT_FAILURE, %s: getsock, __func__);
- if (!prop_dictionary_get_int64(env, vlantag, tag)) {
- errno = ENOENT;
- return -1;
- }
-
if (!prop_dictionary_get_cstring_nocopy(env, vlanif, parent)) {
errno = ENOENT;
return -1;
}
strlcpy(vlr.vlr_parent, parent, sizeof(vlr.vlr_parent));
- if (strcmp(parent, ) != 0)
+ if (strcmp(parent, ) == 0)
+ ;
+ else if (!prop_dictionary_get_int64(env, vlantag, tag)) {
+ errno = ENOENT;
+ return -1;
+ } else
vlr.vlr_tag = (unsigned short)tag;
if (indirect_ioctl(env, SIOCSETVLAN, vlr) == -1)
