CVS commit: src/tests/usr.bin/tmux
Module Name:src
Committed By: jruoho
Date: Sat May 19 07:30:38 UTC 2012
Modified Files:
src/tests/usr.bin/tmux: t_tmux.sh
Log Message:
Make the test pass. It appears that this however does not reproduce the
PR kern/46463, even though the command is exactly the same.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/tmux/t_tmux.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/tmux/t_tmux.sh
diff -u src/tests/usr.bin/tmux/t_tmux.sh:1.1 src/tests/usr.bin/tmux/t_tmux.sh:1.2
--- src/tests/usr.bin/tmux/t_tmux.sh:1.1 Fri May 18 15:25:25 2012
+++ src/tests/usr.bin/tmux/t_tmux.sh Sat May 19 07:30:37 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_tmux.sh,v 1.1 2012/05/18 15:25:25 jruoho Exp $
+# $NetBSD: t_tmux.sh,v 1.2 2012/05/19 07:30:37 jruoho Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,7 @@
stdincrash() {
atf_check -s ignore -o ignore -e ignore -x \
- tmux list-sessions 0- sleep 2; kill $! /dev/null 21
+ \tmux list-sessions 0-\ sleep 2; kill $! /dev/null 21
}
atf_test_case stdin
CVS commit: src/sys/arch/x68k/x68k
Module Name:src Committed By: tsutsui Date: Sat May 19 08:29:32 UTC 2012 Modified Files: src/sys/arch/x68k/x68k: locore.s Log Message: Fix leftover comment derived from hp300 but not applicable to x68k. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/sys/arch/x68k/x68k/locore.s 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/x68k/x68k/locore.s diff -u src/sys/arch/x68k/x68k/locore.s:1.109 src/sys/arch/x68k/x68k/locore.s:1.110 --- src/sys/arch/x68k/x68k/locore.s:1.109 Sun Apr 29 07:17:12 2012 +++ src/sys/arch/x68k/x68k/locore.s Sat May 19 08:29:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.109 2012/04/29 07:17:12 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.110 2012/05/19 08:29:32 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -789,13 +789,7 @@ Lstart2: /* * Prepare to enable MMU. - * Since the kernel is not mapped logical == physical we must insure - * that when the MMU is turned on, all prefetched addresses (including - * the PC) are valid. In order guarantee that, we use the last physical - * page (which is conveniently mapped == VA) and load it up with enough - * code to defeat the prefetch, then we execute the jump back to here. - * - * Is this all really necessary, or am I paranoid?? + * Since the kernel is mapped logical == physical, we just turn it on. */ RELOC(Sysseg_pa, %a0) | system segment table addr movl %a0@,%d1 | read value (a PA)
CVS commit: src/sys/arch/powerpc/stand/mkbootimage
Module Name:src
Committed By: kiyohara
Date: Sat May 19 14:47:38 UTC 2012
Modified Files:
src/sys/arch/powerpc/stand/mkbootimage: mkbootimage.c
Log Message:
prep's boot supports to load kernel from HDD. We can specify option -I
(no in-kernel).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.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/powerpc/stand/mkbootimage/mkbootimage.c
diff -u src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.14 src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.15
--- src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.14 Wed Jan 26 21:35:14 2011
+++ src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c Sat May 19 14:47:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mkbootimage.c,v 1.14 2011/01/26 21:35:14 joerg Exp $ */
+/* $NetBSD: mkbootimage.c,v 1.15 2012/05/19 14:47:37 kiyohara Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -299,8 +299,11 @@ prep_build_image(char *kernel, char *boo
Elf32_External_Phdr phdr;
elf_fd = open_file(bootloader, boot, hdr, elf_stat);
- kern_fd = open_file(kernel, kernel, khdr, kern_stat);
- kern_len = kern_stat.st_size + PREP_MAGICSIZE + KERNLENSIZE;
+ if (inkernflag) {
+ kern_fd = open_file(kernel, kernel, khdr, kern_stat);
+ kern_len = kern_stat.st_size + PREP_MAGICSIZE + KERNLENSIZE;
+ } else
+ kern_len = PREP_MAGICSIZE + KERNLENSIZE;
for (i = 0; i ELFGET16(hdr.e_phnum); i++) {
lseek(elf_fd, ELFGET32(hdr.e_phoff) + sizeof(phdr) * i,
@@ -342,17 +345,20 @@ prep_build_image(char *kernel, char *boo
write(prep_fd, elf_img, elf_img_len);
free(elf_img);
- /* Copy kernel */
- kern_img = (unsigned char *)malloc(kern_stat.st_size);
+ if (inkernflag) {
+ /* Copy kernel */
+ kern_img = (unsigned char *)malloc(kern_stat.st_size);
- if (kern_img == NULL)
- errx(3, Can't malloc: %s, strerror(errno));
+ if (kern_img == NULL)
+ errx(3, Can't malloc: %s, strerror(errno));
- /* we need to jump back after having read the headers */
- lseek(kern_fd, 0, SEEK_SET);
- if (read(kern_fd, (void *)kern_img, kern_stat.st_size) !=
- kern_stat.st_size)
- errx(3, Can't read kernel '%s' : %s, kernel, strerror(errno));
+ /* we need to jump back after having read the headers */
+ lseek(kern_fd, 0, SEEK_SET);
+ if (read(kern_fd, (void *)kern_img, kern_stat.st_size) !=
+ kern_stat.st_size)
+ errx(3, Can't read kernel '%s' : %s,
+ kernel, strerror(errno));
+ }
gzf = gzdopen(dup(prep_fd), a);
if (gzf == NULL)
@@ -368,8 +374,10 @@ prep_build_image(char *kernel, char *boo
/* write in the compressed kernel */
kstart = lseek(prep_fd, 0, SEEK_CUR);
- kgzlen = gzwrite(gzf, kern_img, kern_stat.st_size);
- gzclose(gzf);
+ if (inkernflag) {
+ kgzlen = gzwrite(gzf, kern_img, kern_stat.st_size);
+ gzclose(gzf);
+ }
kend = lseek(prep_fd, 0, SEEK_CUR);
/* jump back to the length position now that we know the length */
@@ -392,8 +400,10 @@ prep_build_image(char *kernel, char *boo
floppy. Can only be used for netboot.\n, getprogname(),
outname, flength);
- free(kern_img);
- close(kern_fd);
+ if (inkernflag) {
+ free(kern_img);
+ close(kern_fd);
+ }
close(prep_fd);
close(elf_fd);
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: riz
Date: Sat May 19 15:01:36 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: vfs_mount.c vfs_syscalls.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #259):
sys/kern/vfs_syscalls.c: revision 1.456
sys/kern/vfs_mount.c: revision 1.14
sys/kern/vfs_syscalls.c: revision 1.452
sys/kern/vfs_syscalls.c: revision 1.453
sys/kern/vfs_syscalls.c: revision 1.454
Do not use vp after mount_domount() call as it sets it to NULL on success.
This fixes a panic when starting extended attributes.
Fix mount -o extattr : previous patch fixed a panic but caused operation
to happen on the mount point instead of the mounted filesystem.
Fix the extattr start fix. Looking up the filesystemroot vnode again
does not seems to be reliable. Instead save it before mount_domount()
sets it to NULL.
Move VFS_EXTATTRCTL to mount_domount(). This makes the
fs/puffs/t_fuzz:mountfuzz7, fs/puffs/t_fuzz:mountfuzz8,
and fs/zfs/t_zpool:create tests pass again. Patch from
manu, discussed on tech-kern and committed at his request.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.6.1 src/sys/kern/vfs_mount.c
cvs rdiff -u -r1.449.2.1 -r1.449.2.2 src/sys/kern/vfs_syscalls.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/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.12 src/sys/kern/vfs_mount.c:1.12.6.1
--- src/sys/kern/vfs_mount.c:1.12 Fri Nov 18 21:17:45 2011
+++ src/sys/kern/vfs_mount.c Sat May 19 15:01:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.12 2011/11/18 21:17:45 christos Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.12.6.1 2012/05/19 15:01:35 riz Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.12 2011/11/18 21:17:45 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.12.6.1 2012/05/19 15:01:35 riz Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -83,6 +83,7 @@ __KERNEL_RCSID(0, $NetBSD: vfs_mount.c,
#include sys/module.h
#include sys/mount.h
#include sys/namei.h
+#include sys/extattr.h
#include sys/syscallargs.h
#include sys/sysctl.h
#include sys/systm.h
@@ -758,8 +759,15 @@ mount_domount(struct lwp *l, vnode_t **v
vfs_unbusy(mp, true, NULL);
(void) VFS_STATVFS(mp, mp-mnt_stat);
error = VFS_START(mp, 0);
- if (error)
+ if (error) {
vrele(vp);
+ } else if (flags MNT_EXTATTR) {
+ error = VFS_EXTATTRCTL(vp-v_mountedhere,
+ EXTATTR_CMD_START, NULL, 0, NULL);
+ if (error)
+ printf(%s: failed to start extattr: error = %d\n,
+ vp-v_mountedhere-mnt_stat.f_mntonname, error);
+ }
/* Drop reference held for VFS_START(). */
vfs_destroy(mp);
*vpp = NULL;
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.449.2.1 src/sys/kern/vfs_syscalls.c:1.449.2.2
--- src/sys/kern/vfs_syscalls.c:1.449.2.1 Thu May 17 18:12:12 2012
+++ src/sys/kern/vfs_syscalls.c Sat May 19 15:01:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.449.2.1 2012/05/17 18:12:12 riz Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.449.2.2 2012/05/19 15:01:35 riz Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.449.2.1 2012/05/17 18:12:12 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.449.2.2 2012/05/19 15:01:35 riz Exp $);
#ifdef _KERNEL_OPT
#include opt_fileassoc.h
@@ -273,20 +273,20 @@ mount_update(struct lwp *l, struct vnode
if ((error == 0) !(saved_flags MNT_EXTATTR)
(flags MNT_EXTATTR)) {
- if (VFS_EXTATTRCTL(vp-v_mount, EXTATTR_CMD_START,
+ if (VFS_EXTATTRCTL(mp, EXTATTR_CMD_START,
NULL, 0, NULL) != 0) {
printf(%s: failed to start extattr, error = %d,
- vp-v_mount-mnt_stat.f_mntonname, error);
+ mp-mnt_stat.f_mntonname, error);
mp-mnt_flag = ~MNT_EXTATTR;
}
}
if ((error == 0) (saved_flags MNT_EXTATTR)
!(flags MNT_EXTATTR)) {
- if (VFS_EXTATTRCTL(vp-v_mount, EXTATTR_CMD_STOP,
+ if (VFS_EXTATTRCTL(mp, EXTATTR_CMD_STOP,
NULL, 0, NULL) != 0) {
printf(%s: failed to stop extattr, error = %d,
- vp-v_mount-mnt_stat.f_mntonname, error);
+ mp-mnt_stat.f_mntonname, error);
mp-mnt_flag |= MNT_RDONLY;
}
}
@@ -463,14 +463,6 @@ do_sys_mount(struct lwp *l, struct vfsop
error = mount_domount(l, vp, vfsops, path, flags, data_buf,
data_len);
vfsopsrele = false;
-
- if ((error == 0) (flags MNT_EXTATTR)) {
- if (VFS_EXTATTRCTL(vp-v_mount, EXTATTR_CMD_START,
- NULL, 0, NULL) != 0)
-printf(%s: failed to start extattr,
- vp-v_mount-mnt_stat.f_mntonname);
-/* XXX remove flag */
- }
}
done:
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: riz
Date: Sat May 19 15:03:32 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: vfs_xattr.c
src/sys/ufs/ufs [netbsd-6]: ufs_extattr.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #260):
sys/kern/vfs_xattr.c: revision 1.31
sys/ufs/ufs/ufs_extattr.c: revision 1.39
Return ENODATA when no attribute is found, like Linux does. After
all we decided to adopt the Linux API, therefore there is rationale
to stick to it.
No standard tells us what to do, and our extended attribute API has not
been used in a release, therefore we do not break anything, and we get
more easily compatible with programs using the Linux extended attribute
API.
Note that FreeBSD and MacOS X return ENOATTR. FreeBSD has its own API
and MacOS X has a Linux-like API. How did the world get so complicated?
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.6.1 src/sys/kern/vfs_xattr.c
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/ufs/ufs/ufs_extattr.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/vfs_xattr.c
diff -u src/sys/kern/vfs_xattr.c:1.29 src/sys/kern/vfs_xattr.c:1.29.6.1
--- src/sys/kern/vfs_xattr.c:1.29 Wed Nov 9 18:29:28 2011
+++ src/sys/kern/vfs_xattr.c Sat May 19 15:03:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_xattr.c,v 1.29 2011/11/09 18:29:28 drochner Exp $ */
+/* $NetBSD: vfs_xattr.c,v 1.29.6.1 2012/05/19 15:03:31 riz Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_xattr.c,v 1.29 2011/11/09 18:29:28 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_xattr.c,v 1.29.6.1 2012/05/19 15:03:31 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -230,7 +230,7 @@ extattr_set_vp(struct vnode *vp, int att
attrlen, l-l_cred);
switch (error) {
- case ENOATTR:
+ case ENODATA:
if (flag XATTR_REPLACE)
goto done;
break;
Index: src/sys/ufs/ufs/ufs_extattr.c
diff -u src/sys/ufs/ufs/ufs_extattr.c:1.36 src/sys/ufs/ufs/ufs_extattr.c:1.36.2.1
--- src/sys/ufs/ufs/ufs_extattr.c:1.36 Fri Jan 27 19:22:49 2012
+++ src/sys/ufs/ufs/ufs_extattr.c Sat May 19 15:03:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_extattr.c,v 1.36 2012/01/27 19:22:49 para Exp $ */
+/* $NetBSD: ufs_extattr.c,v 1.36.2.1 2012/05/19 15:03:31 riz Exp $ */
/*-
* Copyright (c) 1999-2002 Robert N. M. Watson
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_extattr.c,v 1.36 2012/01/27 19:22:49 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_extattr.c,v 1.36.2.1 2012/05/19 15:03:31 riz Exp $);
#ifdef _KERNEL_OPT
#include opt_ffs.h
@@ -834,7 +834,7 @@ ufs_extattr_disable(struct ufsmount *ump
uele = ufs_extattr_find_attr(ump, attrnamespace, attrname);
if (!uele)
- return (ENOATTR);
+ return (ENODATA);
LIST_REMOVE(uele, uele_entries);
@@ -981,7 +981,7 @@ ufs_extattr_get_header(struct vnode *vp,
/* Defined? */
if ((ueh-ueh_flags UFS_EXTATTR_ATTR_FLAG_INUSE) == 0)
- return ENOATTR;
+ return ENODATA;
/* Valid for the current inode generation? */
if (ueh-ueh_i_gen != ip-i_gen) {
@@ -994,7 +994,7 @@ ufs_extattr_get_header(struct vnode *vp,
printf(%s (%s): inode gen inconsistency (%u, %jd)\n,
__func__, mp-mnt_stat.f_mntonname, ueh-ueh_i_gen,
(intmax_t)ip-i_gen);
- return ENOATTR;
+ return ENODATA;
}
/* Local size consistency check. */
@@ -1066,7 +1066,7 @@ ufs_extattr_get(struct vnode *vp, int at
attribute = ufs_extattr_find_attr(ump, attrnamespace, name);
if (!attribute)
- return (ENOATTR);
+ return (ENODATA);
/*
* Allow only offsets of zero to encourage the read/replace
@@ -1185,7 +1185,7 @@ ufs_extattr_list(struct vnode *vp, int a
continue;
error = ufs_extattr_get_header(vp, uele, ueh, NULL);
- if (error == ENOATTR)
+ if (error == ENODATA)
continue;
if (error != 0)
return error;
@@ -1348,7 +1348,7 @@ ufs_extattr_set(struct vnode *vp, int at
attribute = ufs_extattr_autocreate_attr(vp, attrnamespace,
name, l);
if (!attribute)
- return (ENOATTR);
+ return (ENODATA);
}
/*
@@ -1457,7 +1457,7 @@ ufs_extattr_rm(struct vnode *vp, int att
attribute = ufs_extattr_find_attr(ump, attrnamespace, name);
if (!attribute)
- return (ENOATTR);
+ return (ENODATA);
/*
* Don't need to get a lock on the backing file if the getattr is
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Sat May 19 15:06:03 UTC 2012
Modified Files:
src/share/man/man4 [netbsd-6]: mfi.4
src/sys/dev/pci [netbsd-6]: mfi_pci.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #261):
sys/dev/pci/mfi_pci.c: revision 1.14
share/man/man4/mfi.4: revision 1.11
Add IBM ServeRAID M5014 as subtype
Add IBM ServeRAID M1015 and M5014
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.10.1 src/share/man/man4/mfi.4
cvs rdiff -u -r1.12.16.1 -r1.12.16.2 src/sys/dev/pci/mfi_pci.c
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/mfi.4
diff -u src/share/man/man4/mfi.4:1.10 src/share/man/man4/mfi.4:1.10.10.1
--- src/share/man/man4/mfi.4:1.10 Tue Feb 9 06:48:28 2010
+++ src/share/man/man4/mfi.4 Sat May 19 15:06:03 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: mfi.4,v 1.10 2010/02/09 06:48:28 wiz Exp $
+.\ $NetBSD: mfi.4,v 1.10.10.1 2012/05/19 15:06:03 riz Exp $
.\ $OpenBSD: mfi.4,v 1.7 2006/09/01 09:58:09 jmc Exp $
.\
.\ Written by Marco Peereboom ma...@peereboom.us
@@ -24,7 +24,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd February 9, 2010
+.Dd March 22, 2012
.Dt MFI 4
.Os
.Sh NAME
@@ -59,6 +59,9 @@ MegaRAID SAS 8708ELP,
MegaRAID SAS ELP,
MegaRAID SAS 8880EM2,
MegaRAID SAS 9260-8i
+.It
+IBM ServeRAID M1015,
+ServeRAID M5014
.El
.Pp
These controllers support RAID 0, RAID 1, RAID 5, RAID 6, RAID 10, RAID 50 and
Index: src/sys/dev/pci/mfi_pci.c
diff -u src/sys/dev/pci/mfi_pci.c:1.12.16.1 src/sys/dev/pci/mfi_pci.c:1.12.16.2
--- src/sys/dev/pci/mfi_pci.c:1.12.16.1 Thu Mar 22 23:04:26 2012
+++ src/sys/dev/pci/mfi_pci.c Sat May 19 15:06:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi_pci.c,v 1.12.16.1 2012/03/22 23:04:26 riz Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.12.16.2 2012/05/19 15:06:03 riz Exp $ */
/* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom ma...@peereboom.us
@@ -17,7 +17,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfi_pci.c,v 1.12.16.1 2012/03/22 23:04:26 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfi_pci.c,v 1.12.16.2 2012/05/19 15:06:03 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -85,6 +85,7 @@ static const struct mfi_pci_subtype mfi_
static const struct mfi_pci_subtype mfi_gen2_subtypes[] = {
{ PCI_VENDOR_SYMBIOS, 0x9261, SAS 9260-8i },
+ { PCI_VENDOR_IBM, 0x03c7, IBM ServeRAID M5014 SAS/SATA },
{ 0x0, 0, }
};
CVS commit: src/sys/arch/mips/alchemy/dev
Module Name:src
Committed By: kiyohara
Date: Sat May 19 15:17:35 UTC 2012
Modified Files:
src/sys/arch/mips/alchemy/dev: if_aumac.c
Log Message:
Enable interrupt in aumac_init(). And disable in aumac_stop()/aumac_attach().
Interrupt storm happen if received packet and DMA not set.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mips/alchemy/dev/if_aumac.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/mips/alchemy/dev/if_aumac.c
diff -u src/sys/arch/mips/alchemy/dev/if_aumac.c:1.34 src/sys/arch/mips/alchemy/dev/if_aumac.c:1.35
--- src/sys/arch/mips/alchemy/dev/if_aumac.c:1.34 Thu Feb 2 19:42:59 2012
+++ src/sys/arch/mips/alchemy/dev/if_aumac.c Sat May 19 15:17:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.34 2012/02/02 19:42:59 tls Exp $ */
+/* $NetBSD: if_aumac.c,v 1.35 2012/05/19 15:17:35 kiyohara Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_aumac.c,v 1.34 2012/02/02 19:42:59 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_aumac.c,v 1.35 2012/05/19 15:17:35 kiyohara Exp $);
@@ -123,6 +123,7 @@ struct aumac_softc {
struct ethercom sc_ethercom; /* Ethernet common data */
void *sc_sdhook; /* shutdown hook */
+ int sc_irq;
void *sc_ih; /* interrupt cookie */
struct mii_data sc_mii; /* MII/media information */
@@ -272,6 +273,8 @@ aumac_attach(device_t parent, device_t s
unable to register interrupt handler\n);
return;
}
+ sc-sc_irq = aa-aa_irq[0];
+ au_intr_disable(sc-sc_irq);
/*
* Allocate space for the transmit and receive buffers.
@@ -808,6 +811,7 @@ aumac_init(struct ifnet *ifp)
ifp-if_flags |= IFF_RUNNING;
ifp-if_flags = ~IFF_OACTIVE;
+ au_intr_enable(sc-sc_irq);
out:
if (error)
printf(%s: interface not running\n, device_xname(sc-sc_dev));
@@ -836,6 +840,8 @@ aumac_stop(struct ifnet *ifp, int disabl
/* Power down/reset the MAC. */
aumac_powerdown(sc);
+ au_intr_disable(sc-sc_irq);
+
/* Mark the interface as down and cancel the watchdog timer. */
ifp-if_flags = ~(IFF_RUNNING | IFF_OACTIVE);
ifp-if_timer = 0;
CVS commit: [netbsd-6] src/sys/compat/linux32
Module Name:src
Committed By: riz
Date: Sat May 19 15:19:43 UTC 2012
Modified Files:
src/sys/compat/linux32/arch/amd64 [netbsd-6]: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
syscalls.master
src/sys/compat/linux32/common [netbsd-6]: linux32_signal.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #263):
sys/compat/linux32/arch/amd64/linux32_syscallargs.h: revision 1.66
sys/compat/linux32/arch/amd64/syscalls.master: revision 1.61
sys/compat/linux32/common/linux32_signal.c: revision 1.16
sys/compat/linux32/arch/amd64/linux32_syscall.h: revision 1.66
sys/compat/linux32/arch/amd64/linux32_sysent.c: revision 1.66
sys/compat/linux32/arch/amd64/linux32_syscalls.c: revision 1.66
regen
Fix rt_sigtimedwait():
It is wishful thinking that:
1. declaring a 32 bit syscall with 64 bit pointers
2. passing a struct with 32 bit pointers to a 64 bit function
is going to work.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.65.6.1 \
src/sys/compat/linux32/arch/amd64/linux32_syscall.h \
src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \
src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \
src/sys/compat/linux32/arch/amd64/linux32_sysent.c
cvs rdiff -u -r1.60 -r1.60.6.1 \
src/sys/compat/linux32/arch/amd64/syscalls.master
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/compat/linux32/common/linux32_signal.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/compat/linux32/arch/amd64/linux32_syscall.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65.6.1
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65 Fri Nov 18 04:20:16 2011
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Sat May 19 15:19:42 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.65 2011/11/18 04:20:16 christos Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.65.6.1 2012/05/19 15:19:42 riz Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.60 2011/11/18 04:08:56 christos Exp
+ * created from NetBSD: syscalls.master,v 1.61 2012/05/10 19:40:46 christos Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -445,7 +445,7 @@
/* syscall: rt_sigpending ret: int args: linux32_sigsetp_t netbsd32_size_t */
#define LINUX32_SYS_rt_sigpending 176
-/* syscall: rt_sigtimedwait ret: int args: const linux32_sigset_t * linux32_siginfo_t * const struct linux_timespec32 * */
+/* syscall: rt_sigtimedwait ret: int args: const linux32_sigsetp_t linux32_siginfop_t const linux32_timespecp_t */
#define LINUX32_SYS_rt_sigtimedwait 177
/* syscall: rt_queueinfo ret: int args: int int linux32_siginfop_t */
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65.6.1
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65 Fri Nov 18 04:20:16 2011
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Sat May 19 15:19:42 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.65 2011/11/18 04:20:16 christos Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.65.6.1 2012/05/19 15:19:42 riz Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.60 2011/11/18 04:08:56 christos Exp
+ * created from NetBSD: syscalls.master,v 1.61 2012/05/10 19:40:46 christos Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -605,9 +605,9 @@ struct linux32_sys_rt_sigpending_args {
check_syscall_args(linux32_sys_rt_sigpending)
struct linux32_sys_rt_sigtimedwait_args {
- syscallarg(const linux32_sigset_t *) set;
- syscallarg(linux32_siginfo_t *) info;
- syscallarg(const struct linux_timespec32 *) timeout;
+ syscallarg(const linux32_sigsetp_t) set;
+ syscallarg(linux32_siginfop_t) info;
+ syscallarg(const linux32_timespecp_t) timeout;
};
check_syscall_args(linux32_sys_rt_sigtimedwait)
Index: src/sys/compat/linux32/arch/amd64/linux32_syscalls.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.65 src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.65.6.1
--- src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.65 Fri Nov 18 04:20:16 2011
+++ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c Sat May 19 15:19:43 2012
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.65 2011/11/18 04:20:16 christos Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.65.6.1 2012/05/19 15:19:43 riz Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.60 2011/11/18 04:08:56 christos Exp
+ * created from
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Sat May 19 15:23:44 UTC 2012
Modified Files:
src/distrib/sets/lists/base [netbsd-6]: mi
src/distrib/sets/lists/comp [netbsd-6]: mi
src/distrib/sets/lists/man [netbsd-6]: mi
src/external/bsd/bind [netbsd-6]: Makefile.inc
src/external/bsd/bind/bin [netbsd-6]: Makefile Makefile.inc
Added Files:
src/external/bsd/bind/bin/confgen [netbsd-6]: Makefile Makefile.inc
src/external/bsd/bind/bin/confgen/ddns-confgen [netbsd-6]: Makefile
src/external/bsd/bind/bin/confgen/rndc-confgen [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by christos in ticket #264):
distrib/sets/lists/comp/mi: revision 1.1757
external/bsd/bind/bin/Makefile: revision 1.4
external/bsd/bind/Makefile.inc: revision 1.13
external/bsd/bind/bin/Makefile.inc: revision 1.2
distrib/sets/lists/base/mi: revision 1.991
external/bsd/bind/bin/confgen/Makefile.inc: revision 1.1
external/bsd/bind/bin/confgen/Makefile: revision 1.1
external/bsd/bind/bin/confgen/ddns-confgen/Makefile: revision 1.1
distrib/sets/lists/man/mi: revision 1.1389
external/bsd/bind/bin/confgen/rndc-confgen/Makefile: revision 1.1
add confgen programs
add {rndc,ddns}-confgen
To generate a diff of this commit:
cvs rdiff -u -r1.984.2.2 -r1.984.2.3 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1738.2.2 -r1.1738.2.3 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1379.2.3 -r1.1379.2.4 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.12 -r1.12.4.1 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.3 -r1.3.4.1 src/external/bsd/bind/bin/Makefile
cvs rdiff -u -r1.1 -r1.1.10.1 src/external/bsd/bind/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1.2.2 src/external/bsd/bind/bin/confgen/Makefile \
src/external/bsd/bind/bin/confgen/Makefile.inc
cvs rdiff -u -r0 -r1.1.2.2 \
src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile
cvs rdiff -u -r0 -r1.1.2.2 \
src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.984.2.2 src/distrib/sets/lists/base/mi:1.984.2.3
--- src/distrib/sets/lists/base/mi:1.984.2.2 Fri Mar 2 18:27:49 2012
+++ src/distrib/sets/lists/base/mi Sat May 19 15:23:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984.2.2 2012/03/02 18:27:49 riz Exp $
+# $NetBSD: mi,v 1.984.2.3 2012/05/19 15:23:41 riz Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -1185,6 +1185,7 @@
./usr/sbin/cron base-cron-bin
./usr/sbin/daicctlbase-isdn-bin
./usr/sbin/dbsymbase-sysutil-bin binutils
+./usr/sbin/ddns-confgenbase-bind-bin
./usr/sbin/dev_mkdbbase-sysutil-bin
./usr/sbin/dhcpdbase-dhcpd-bin
./usr/sbin/dhcrelaybase-dhcpd-bin
@@ -1406,7 +1407,7 @@
./usr/sbin/rip6querybase-netutil-bin inet6
./usr/sbin/rmt base-sysutil-bin
./usr/sbin/rndc base-bind-bin
-./usr/sbin/rndc-confgenbase-obsolete obsolete
+./usr/sbin/rndc-confgenbase-bind-bin
./usr/sbin/route6dbase-router-bin use_inet6
./usr/sbin/rpc.bootparamd base-bootserver-bin
./usr/sbin/rpc.lockdbase-nfsserver-bin
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1738.2.2 src/distrib/sets/lists/comp/mi:1.1738.2.3
--- src/distrib/sets/lists/comp/mi:1.1738.2.2 Wed May 9 18:22:32 2012
+++ src/distrib/sets/lists/comp/mi Sat May 19 15:23:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1738.2.2 2012/05/09 18:22:32 riz Exp $
+# $NetBSD: mi,v 1.1738.2.3 2012/05/19 15:23:39 riz Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -4077,6 +4077,7 @@
./usr/libdata/debug/usr/sbin/cron.debug comp-cron-debug debug
./usr/libdata/debug/usr/sbin/daicctl.debug comp-isdn-debug debug
./usr/libdata/debug/usr/sbin/dbsym.debug comp-sysutil-debug binutils,debug
+./usr/libdata/debug/usr/sbin/ddns-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/dev_mkdb.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug debug
./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug debug
@@ -4246,7 +4247,7 @@
./usr/libdata/debug/usr/sbin/revnetgroup.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/sbin/rip6query.debug comp-netutil-debug inet6,debug
./usr/libdata/debug/usr/sbin/rmt.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/rndc-confgen.debug comp-obsolete obsolete
+./usr/libdata/debug/usr/sbin/rndc-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/rndc.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/route6d.debug comp-router-debug use_inet6,debug
./usr/libdata/debug/usr/sbin/rpc.bootparamd.debug comp-bootserver-debug debug
Index:
CVS commit: [netbsd-6] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 15:25:53 UTC 2012 Modified Files: src/sys/netsmb [netbsd-6]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #265): sys/netsmb/subr_mchain.c: revision 1.21 Since len has changed to (unsinged) size_t, the while loop condition (len 0) became less able to detect its underflow. So check the subtrahend to avoid the underflow. Should fix PR kern/44092. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.14.1 src/sys/netsmb/subr_mchain.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/netsmb/subr_mchain.c diff -u src/sys/netsmb/subr_mchain.c:1.20 src/sys/netsmb/subr_mchain.c:1.20.14.1 --- src/sys/netsmb/subr_mchain.c:1.20 Fri Dec 17 13:05:29 2010 +++ src/sys/netsmb/subr_mchain.c Sat May 19 15:25:53 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_mchain.c,v 1.20 2010/12/17 13:05:29 pooka Exp $ */ +/* $NetBSD: subr_mchain.c,v 1.20.14.1 2012/05/19 15:25:53 riz Exp $ */ /* * Copyright (c) 2000, 2001 Boris Popov @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.20 2010/12/17 13:05:29 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.20.14.1 2012/05/19 15:25:53 riz Exp $); #include sys/param.h #include sys/systm.h @@ -66,7 +66,7 @@ m_getm(struct mbuf *m, size_t len, int h } } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); if (m != NULL) for (mtail = m; mtail-m_next != NULL; mtail = mtail-m_next); @@ -88,7 +88,7 @@ m_getm(struct mbuf *m, size_t len, int h } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); } if (mtail != NULL)
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src Committed By: riz Date: Sat May 19 15:28:01 UTC 2012 Modified Files: src/sys/dev/pci [netbsd-6]: if_wpi.c Log Message: Pull up following revision(s) (requested by khorben in ticket #266): sys/dev/pci/if_wpi.c: revision 1.51 No longer wrongly advertise ad-hoc (IBSS) mode as being supported. Fixes kern/46101 No objection from current-users@ To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.2.1 src/sys/dev/pci/if_wpi.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/if_wpi.c diff -u src/sys/dev/pci/if_wpi.c:1.50 src/sys/dev/pci/if_wpi.c:1.50.2.1 --- src/sys/dev/pci/if_wpi.c:1.50 Mon Jan 30 19:41:21 2012 +++ src/sys/dev/pci/if_wpi.c Sat May 19 15:28:00 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wpi.c,v 1.50 2012/01/30 19:41:21 drochner Exp $*/ +/* $NetBSD: if_wpi.c,v 1.50.2.1 2012/05/19 15:28:00 riz Exp $*/ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.50 2012/01/30 19:41:21 drochner Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.50.2.1 2012/05/19 15:28:00 riz Exp $); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -310,7 +310,9 @@ wpi_attach(device_t parent __unused, dev /* set device capabilities */ ic-ic_caps = +#ifdef netyet IEEE80211_C_IBSS | /* IBSS mode support */ +#endif IEEE80211_C_WPA |/* 802.11i */ IEEE80211_C_MONITOR |/* monitor mode supported */ IEEE80211_C_TXPMGT | /* tx power management */
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: riz
Date: Sat May 19 15:29:21 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: vfs_subr.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #267):
sys/kern/vfs_subr.c: revision 1.435
remove a bogus optimization introduced in the previous change.
fixes hangs in the rump/rumpvfs/t_etfs test.
To generate a diff of this commit:
cvs rdiff -u -r1.432.2.1 -r1.432.2.2 src/sys/kern/vfs_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/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.432.2.1 src/sys/kern/vfs_subr.c:1.432.2.2
--- src/sys/kern/vfs_subr.c:1.432.2.1 Mon May 7 03:01:13 2012
+++ src/sys/kern/vfs_subr.c Sat May 19 15:29:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.432.2.1 2012/05/07 03:01:13 riz Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.432.2.2 2012/05/19 15:29:21 riz Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.432.2.1 2012/05/07 03:01:13 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.432.2.2 2012/05/19 15:29:21 riz Exp $);
#include opt_ddb.h
#include opt_compat_netbsd.h
@@ -290,9 +290,6 @@ vflushbuf(struct vnode *vp, int flags)
mutex_enter(vp-v_interlock);
(void) VOP_PUTPAGES(vp, 0, 0, pflags);
- if (LIST_EMPTY(vp-v_dirtyblkhd) || (flags FSYNC_DATAONLY))
- return 0;
-
loop:
mutex_enter(bufcache_lock);
for (bp = LIST_FIRST(vp-v_dirtyblkhd); bp; bp = nbp) {
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Sat May 19 15:31:22 UTC 2012
Modified Files:
src/usr.bin/quota [netbsd-6]: quota.1 quota.c
src/usr.sbin/repquota [netbsd-6]: repquota.8 repquota.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #268):
usr.bin/quota/quota.1: revision 1.18
usr.bin/quota/quota.1: revision 1.19
usr.sbin/repquota/repquota.8: revision 1.16
usr.sbin/repquota/repquota.8: revision 1.17
usr.bin/quota/quota.c: revision 1.49
usr.sbin/repquota/repquota.c: revision 1.44
Remove traces of -D flag, which no longer does anything.
Remove traces of -D option, which no longer does anything.
Bump date for previous.
Bump date for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/usr.bin/quota/quota.1
cvs rdiff -u -r1.48 -r1.48.2.1 src/usr.bin/quota/quota.c
cvs rdiff -u -r1.15 -r1.15.2.1 src/usr.sbin/repquota/repquota.8
cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/repquota/repquota.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/quota/quota.1
diff -u src/usr.bin/quota/quota.1:1.17 src/usr.bin/quota/quota.1:1.17.2.1
--- src/usr.bin/quota/quota.1:1.17 Mon Feb 13 19:53:25 2012
+++ src/usr.bin/quota/quota.1 Sat May 19 15:31:21 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: quota.1,v 1.17 2012/02/13 19:53:25 dholland Exp $
+.\ $NetBSD: quota.1,v 1.17.2.1 2012/05/19 15:31:21 riz Exp $
.\
.\ Copyright (c) 1983, 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ from: @(#)quota.1 8.1 (Berkeley) 6/6/93
.\
-.Dd March 6, 2011
+.Dd May 12, 2012
.Dt QUOTA 1
.Os
.Sh NAME
@@ -40,19 +40,19 @@
.Nd display disk usage and limits
.Sh SYNOPSIS
.Nm
-.Op Fl Dghu
+.Op Fl ghu
.Op Fl v | Fl q
.Nm
-.Op Fl Dhu
+.Op Fl hu
.Op Fl v | Fl q
.Ar user
.Nm
-.Op Fl Dgh
+.Op Fl gh
.Op Fl v | Fl q
.Ar group
.Nm
.Fl d
-.Op Fl Dgh
+.Op Fl gh
.Op Fl v | Fl q
.Sh DESCRIPTION
.Nm
@@ -62,8 +62,6 @@ By default only the user quotas are prin
Options:
.Pp
.Bl -tag -width Ds
-.It Fl D
-Debug: print plist sent to and received from kernel.
.It Fl d
Query the kernel for default user or group quota instead of a specific
user or group.
Index: src/usr.bin/quota/quota.c
diff -u src/usr.bin/quota/quota.c:1.48 src/usr.bin/quota/quota.c:1.48.2.1
--- src/usr.bin/quota/quota.c:1.48 Sun Feb 5 14:14:44 2012
+++ src/usr.bin/quota/quota.c Sat May 19 15:31:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $ */
+/* $NetBSD: quota.c,v 1.48.2.1 2012/05/19 15:31:21 riz Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $);
+__RCSID($NetBSD: quota.c,v 1.48.2.1 2012/05/19 15:31:21 riz Exp $);
#endif
#endif /* not lint */
@@ -104,7 +104,6 @@ static int qflag = 0;
static int vflag = 0;
static int hflag = 0;
static int dflag = 0;
-static int Dflag = 0;
static uid_t myuid;
static int needheading;
@@ -117,7 +116,7 @@ main(int argc, char *argv[])
int ch;
myuid = getuid();
- while ((ch = getopt(argc, argv, Ddhugvq)) != -1) {
+ while ((ch = getopt(argc, argv, dhugvq)) != -1) {
switch(ch) {
case 'g':
gflag++;
@@ -137,9 +136,6 @@ main(int argc, char *argv[])
case 'd':
dflag++;
break;
- case 'D':
- Dflag++;
- break;
default:
usage();
}
@@ -525,7 +521,7 @@ getprivs(id_t id, int idtype)
err(1, Out of memory);
}
if (getvfsquota(fst[i].f_mntonname, qup-qvs, version,
- id, idtype, dflag, Dflag) != 1)
+ id, idtype, dflag, 0) != 1)
continue;
} else
continue;
Index: src/usr.sbin/repquota/repquota.8
diff -u src/usr.sbin/repquota/repquota.8:1.15 src/usr.sbin/repquota/repquota.8:1.15.2.1
--- src/usr.sbin/repquota/repquota.8:1.15 Mon Feb 13 13:37:45 2012
+++ src/usr.sbin/repquota/repquota.8 Sat May 19 15:31:21 2012
@@ -29,9 +29,9 @@
.\ SUCH DAMAGE.
.\
.\ from: @(#)repquota.8 8.1 (Berkeley) 6/6/93
-.\ $NetBSD: repquota.8,v 1.15 2012/02/13 13:37:45 wiz Exp $
+.\ $NetBSD: repquota.8,v 1.15.2.1 2012/05/19 15:31:21 riz Exp $
.\
-.Dd February 13, 2012
+.Dd May 12, 2012
.Dt REPQUOTA 8
.Os
.Sh NAME
@@ -39,17 +39,17 @@
.Nd summarize quotas for a file system
.Sh SYNOPSIS
.Nm
-.Op Fl Dghuv
+.Op Fl ghuv
.Ar file-system Ar ...
.Nm
-.Op Fl Dghuv
+.Op Fl ghuv
.Fl a
.Nm
.Fl x
-.Op Fl Dgu
+.Op Fl gu
.Ar file-system
.Nm quotadump
-.Op Fl Dgu
+.Op Fl gu
.Ar file-system
.Sh DESCRIPTION
.Nm
@@ -60,8 +60,6 @@ Available options:
.Bl -tag -width Ds
.It Fl a
Print the quotas of all the mounted file systems.
-.It Fl D
-Debug: print plist sent to and received from kernel.
.It Fl g
Print only group quotas (the default is to print both
group and user quotas if they
CVS commit: [netbsd-6] src/external/bsd/wpa/dist/src/drivers
Module Name:src
Committed By: riz
Date: Sat May 19 15:32:38 UTC 2012
Modified Files:
src/external/bsd/wpa/dist/src/drivers [netbsd-6]: driver_bsd.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #269):
external/bsd/wpa/dist/src/drivers/driver_bsd.c: revision 1.5
Make WPA works on big-endian machines.
Need byte swapping to copy seq to member ik_keyrsc. The code is
borrowed from driver_madwifi.c.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 \
src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.4 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.4.8.1
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.4 Sat Dec 25 20:45:49 2010
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c Sat May 19 15:32:37 2012
@@ -347,7 +347,19 @@ bsd_set_key(const char *ifname, void *pr
if (wk.ik_keyix != IEEE80211_KEYIX_NONE set_tx)
wk.ik_flags |= IEEE80211_KEY_DEFAULT;
wk.ik_keylen = key_len;
+#ifdef WORDS_BIGENDIAN
+#define WPA_KEY_RSC_LEN 8
+ {
+ size_t i;
+ u8 tmp[WPA_KEY_RSC_LEN];
+ os_memset(tmp, 0, sizeof(tmp));
+ for (i = 0; i seq_len; i++)
+ tmp[WPA_KEY_RSC_LEN - i - 1] = seq[i];
+ os_memcpy(wk.ik_keyrsc, tmp, WPA_KEY_RSC_LEN);
+ }
+#else /* WORDS_BIGENDIAN */
os_memcpy(wk.ik_keyrsc, seq, seq_len);
+#endif /* WORDS_BIGENDIAN */
os_memcpy(wk.ik_keydata, key, key_len);
return set80211var(priv, IEEE80211_IOC_WPAKEY, wk, sizeof(wk));
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Sat May 19 15:34:32 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: sys_pipe.c
src/tests/lib/libc/sys [netbsd-6]: t_pipe2.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #270):
sys/kern/sys_pipe.c: revision 1.136
tests/lib/libc/sys/t_pipe2.c: revision 1.4
tests/lib/libc/sys/t_pipe2.c: revision 1.5
tests/lib/libc/sys/t_pipe2.c: revision 1.6
tests/lib/libc/sys/t_pipe2.c: revision 1.7
Make sure we can deliver two file descriptors for pipe2() before we set
up anything special (like close on exec).
Fixes PR kern/46457.
Add a case for PR kern/46457. This is skipped for the time being, as it
reproduces the panic described in the PR.
Enable the test for PR kern/46457 now that it does not crash the
kernel any more.
Fix typo in comment.
Simplify the test for PR kern/4645 and make it independend of resource
settings.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.135.2.1 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/tests/lib/libc/sys/t_pipe2.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_pipe.c
diff -u src/sys/kern/sys_pipe.c:1.135 src/sys/kern/sys_pipe.c:1.135.2.1
--- src/sys/kern/sys_pipe.c:1.135 Wed Jan 25 00:28:36 2012
+++ src/sys/kern/sys_pipe.c Sat May 19 15:34:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_pipe.c,v 1.135 2012/01/25 00:28:36 christos Exp $ */
+/* $NetBSD: sys_pipe.c,v 1.135.2.1 2012/05/19 15:34:32 riz Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_pipe.c,v 1.135 2012/01/25 00:28:36 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_pipe.c,v 1.135.2.1 2012/05/19 15:34:32 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -267,21 +267,23 @@ pipe1(struct lwp *l, register_t *retval,
if (error)
goto free2;
retval[0] = fd;
- rf-f_flag = FREAD | flags;
- rf-f_type = DTYPE_PIPE;
- rf-f_data = (void *)rpipe;
- rf-f_ops = pipeops;
- fd_set_exclose(l, fd, (flags O_CLOEXEC) != 0);
error = fd_allocfile(wf, fd);
if (error)
goto free3;
retval[1] = fd;
+
+ rf-f_flag = FREAD | flags;
+ rf-f_type = DTYPE_PIPE;
+ rf-f_data = (void *)rpipe;
+ rf-f_ops = pipeops;
+ fd_set_exclose(l, (int)retval[0], (flags O_CLOEXEC) != 0);
+
wf-f_flag = FWRITE | flags;
wf-f_type = DTYPE_PIPE;
wf-f_data = (void *)wpipe;
wf-f_ops = pipeops;
- fd_set_exclose(l, fd, (flags O_CLOEXEC) != 0);
+ fd_set_exclose(l, (int)retval[1], (flags O_CLOEXEC) != 0);
rpipe-pipe_peer = wpipe;
wpipe-pipe_peer = rpipe;
Index: src/tests/lib/libc/sys/t_pipe2.c
diff -u src/tests/lib/libc/sys/t_pipe2.c:1.3 src/tests/lib/libc/sys/t_pipe2.c:1.3.2.1
--- src/tests/lib/libc/sys/t_pipe2.c:1.3 Sat Jan 28 02:47:09 2012
+++ src/tests/lib/libc/sys/t_pipe2.c Sat May 19 15:34:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pipe2.c,v 1.3 2012/01/28 02:47:09 christos Exp $ */
+/* $NetBSD: t_pipe2.c,v 1.3.2.1 2012/05/19 15:34:32 riz Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -36,13 +36,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_pipe2.c,v 1.3 2012/01/28 02:47:09 christos Exp $);
+__RCSID($NetBSD: t_pipe2.c,v 1.3.2.1 2012/05/19 15:34:32 riz Exp $);
#include atf-c.h
#include fcntl.h
#include unistd.h
#include stdlib.h
#include errno.h
+#include sys/resource.h
static void
run(int flags)
@@ -98,6 +99,39 @@ ATF_TC_BODY(pipe2_basic, tc)
run(0);
}
+ATF_TC(pipe2_consume);
+ATF_TC_HEAD(pipe2_consume, tc)
+{
+ atf_tc_set_md_var(tc, descr, Test that consuming file descriptors
+ with pipe2(2) does not crash the system (PR kern/46457));
+}
+
+ATF_TC_BODY(pipe2_consume, tc)
+{
+ struct rlimit rl;
+ int err, filedes[2];
+
+ err = fcntl(4, F_CLOSEM);
+ ATF_REQUIRE(err == 0);
+
+ err = getrlimit(RLIMIT_NOFILE, rl);
+ ATF_REQUIRE(err == 0);
+ /*
+ * The heart of this test is to run against the number of open
+ * file descriptor limit in the middle of a pipe2() call - i.e.
+ * before the call only a single descriptor may be openend.
+ */
+ rl.rlim_cur = 4;
+ err = setrlimit(RLIMIT_NOFILE, rl);
+ ATF_REQUIRE(err == 0);
+
+ /*
+ * atf_tc_skip(The test case causes a panic (PR kern/46457));
+ */
+ err = pipe2(filedes, O_CLOEXEC);
+ ATF_REQUIRE(err == -1);
+}
+
ATF_TC(pipe2_nonblock);
ATF_TC_HEAD(pipe2_nonblock, tc)
{
@@ -147,6 +181,7 @@ ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, pipe2_basic);
+ ATF_TP_ADD_TC(tp, pipe2_consume);
ATF_TP_ADD_TC(tp, pipe2_nonblock);
ATF_TP_ADD_TC(tp, pipe2_cloexec);
ATF_TP_ADD_TC(tp, pipe2_nosigpipe);
CVS commit: [netbsd-6] xsrc/external/mit/libXfont/dist/src/bitmap
Module Name:xsrc Committed By: riz Date: Sat May 19 15:40:32 UTC 2012 Modified Files: xsrc/external/mit/libXfont/dist/src/bitmap [netbsd-6]: pcfread.c Log Message: Pull up following revision(s) (requested by cheusov in ticket #272): external/mit/libXfont/dist/src/bitmap/pcfread.c: revision 1.2 fix in libxfont: An uninitialized pointer causes a crash if pcf header is corrupted (upstream patch). To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \ xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c diff -u xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.1.1.2 xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.1.1.2.2.1 --- xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.1.1.2 Wed Jun 10 07:33:40 2009 +++ xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c Sat May 19 15:40:31 2012 @@ -408,6 +408,8 @@ pcfReadFont(FontPtr pFont, FontFilePtr f pFont-info.nprops = 0; pFont-info.props = 0; +pFont-info.isStringProp=0; + if (!(tables = pcfReadTOC(file, ntables))) goto Bail;
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat May 19 15:42:03 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 259-261,263-270,272. To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.102 src/doc/CHANGES-6.0:1.1.2.103 --- src/doc/CHANGES-6.0:1.1.2.102 Fri May 18 17:05:16 2012 +++ src/doc/CHANGES-6.0 Sat May 19 15:42:03 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.102 2012/05/18 17:05:16 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.103 2012/05/19 15:42:03 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -2405,3 +2405,88 @@ sys/net/if_ethersubr.c1.189 Fix crash when detaching some network interfaces. PR#42982. [chs, ticket #258] +sys/kern/vfs_mount.c1.14 +sys/kern/vfs_syscalls.c1.452-1.454,1.456 +sys/kern/vfs_syscalls.c1.453 +sys/kern/vfs_syscalls.c1.454 +sys/kern/vfs_syscalls.c1.456 + + Fix mounting with extended attributes; fix a leak. + [manu, ticket #259] + +sys/kern/vfs_xattr.c1.31 +sys/ufs/ufs/ufs_extattr.c 1.39 + + Return ENODATA for missing extended attributes. + [manu, ticket #260] + +share/man/man4/mfi.41.11 +sys/dev/pci/mfi_pci.c1.14 + + Add IBM ServeRAID M5014 as subtype, update man page for M1015 + and M5014. + [sborrill, ticket #261] + +sys/compat/linux32/arch/amd64/linux32_syscall.h 1.66 +sys/compat/linux32/arch/amd64/linux32_syscallargs.h 1.66 +sys/compat/linux32/arch/amd64/linux32_syscalls.c 1.66 +sys/compat/linux32/arch/amd64/linux32_sysent.c 1.66 +sys/compat/linux32/arch/amd64/syscalls.master 1.61 +sys/compat/linux32/common/linux32_signal.c 1.16 + + Fix broken sigwaitinfo linux emulation. + [christos, ticket #263] + +distrib/sets/lists/base/mi 1.991 +distrib/sets/lists/comp/mi 1.1757 +distrib/sets/lists/man/mi 1.1389 +external/bsd/bind/Makefile.inc 1.13 +external/bsd/bind/bin/Makefile 1.4 +external/bsd/bind/bin/Makefile.inc 1.2 +external/bsd/bind/bin/confgen/Makefile 1.1 +external/bsd/bind/bin/confgen/Makefile.inc 1.1 +external/bsd/bind/bin/confgen/ddns-confgen/Makefile 1.1 +external/bsd/bind/bin/confgen/rndc-confgen/Makefile 1.1 + + Add BIND confgen programs. + [christos, ticket #264] + +sys/netsmb/subr_mchain.c 1.21 + + Fix problem copying files to SMB-mounted partitions. PR#44092. + [nakayama, ticket #265] + +sys/dev/pci/if_wpi.c1.51 + + Do not advertise IBSS mode, because it isn't supported. PR#46101. + [khorben, ticket #266] + +sys/kern/vfs_subr.c1.435 + + Fix hangs in the rump/rumpvfs/t_etfs test. + [chs, ticket #267] + +usr.bin/quota/quota.11.18-1.19 +usr.bin/quota/quota.c1.49 +usr.sbin/repquota/repquota.8 1.16-1.17 +usr.sbin/repquota/repquota.c 1.44 + + Clean up some quota-related leftovers. + [dholland, ticket #268] + +external/bsd/wpa/dist/src/drivers/driver_bsd.c 1.5 + + Make WPA work on big-endian machines. + [nakayama, ticket #269] + +sys/kern/sys_pipe.c1.136 +tests/lib/libc/sys/t_pipe2.c 1.4-1.7 + + Address local user KASSERT. PR#46457. + [martin, ticket #270] + +xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c 1.2 + + Fix segfault in libXfont. + [cheusov, ticket #272] +
CVS commit: src/sys
Module Name:src
Committed By: tls
Date: Sat May 19 16:00:41 UTC 2012
Modified Files:
src/sys/dev: rndpseudo.c
src/sys/kern: subr_cprng.c
Log Message:
Fix two problems that could cause /dev/random to not wake up readers when
entropy became available.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.8 -r1.9 src/sys/kern/subr_cprng.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/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.9 src/sys/dev/rndpseudo.c:1.10
--- src/sys/dev/rndpseudo.c:1.9 Fri Apr 20 21:57:33 2012
+++ src/sys/dev/rndpseudo.c Sat May 19 16:00:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.9 2012/04/20 21:57:33 tls Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.10 2012/05/19 16:00:41 tls Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rndpseudo.c,v 1.9 2012/04/20 21:57:33 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: rndpseudo.c,v 1.10 2012/05/19 16:00:41 tls Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -309,14 +309,23 @@ rnd_read(struct file * fp, off_t *offp,
/* XXX is this _really_ what's wanted? */
if (ctx-hard) {
n = MIN(want, strength - ctx-bytesonkey);
- ctx-bytesonkey += n;
+ if (n 1) {
+ cprng_strong_deplete(cprng);
+ n = MIN(want, strength);
+ ctx-bytesonkey = 0;
+ membar_producer();
+ }
} else {
n = want;
}
nread = cprng_strong(cprng, bf, n,
(fp-f_flag FNONBLOCK) ? FNONBLOCK : 0);
- if (nread != n) {
+
+ if (ctx-hard nread 0) {
+ atomic_add_int(ctx-bytesonkey, nread);
+ }
+ if (nread 1) {
if (fp-f_flag FNONBLOCK) {
ret = EWOULDBLOCK;
} else {
@@ -331,12 +340,6 @@ rnd_read(struct file * fp, off_t *offp,
}
}
out:
- if (ctx-bytesonkey = strength) {
- /* Force reseed of underlying DRBG (prediction resistance) */
- cprng_strong_deplete(cprng);
- ctx-bytesonkey = 0;
- }
-
pool_cache_put(rp_pc, bf);
return (ret);
}
Index: src/sys/kern/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.8 src/sys/kern/subr_cprng.c:1.9
--- src/sys/kern/subr_cprng.c:1.8 Tue Apr 17 02:50:39 2012
+++ src/sys/kern/subr_cprng.c Sat May 19 16:00:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.8 2012/04/17 02:50:39 tls Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.9 2012/05/19 16:00:41 tls Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
#include sys/cprng.h
-__KERNEL_RCSID(0, $NetBSD: subr_cprng.c,v 1.8 2012/04/17 02:50:39 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_cprng.c,v 1.9 2012/05/19 16:00:41 tls Exp $);
void
cprng_init(void)
@@ -144,6 +144,9 @@ cprng_strong_reseed(void *const arg)
#ifdef RND_VERBOSE
printf(cprng: sink %s cprng busy, no reseed\n, c-reseed.name);
#endif
+ if (c-flags CPRNG_USE_CV) { /* XXX if flags change? */
+ cv_broadcast(c-cv);
+ }
return;
}
@@ -240,23 +243,32 @@ cprng_strong(cprng_strong_t *const c, vo
failed., c-name);
}
} else {
- if (!(flags FNONBLOCK)
- (c-flags CPRNG_USE_CV)) {
-int wr;
+ int wr;
+ do {
cprng_strong_sched_reseed(c);
-do {
- wr = cv_wait_sig(c-cv, c-mtx);
- if (wr == ERESTART) {
- mutex_exit(c-mtx);
- return 0;
- }
-} while (nist_ctr_drbg_generate(c-drbg, p,
-len, cc,
-sizeof(cc)));
- } else {
-len = 0;
- }
+if ((flags FNONBLOCK) ||
+!(c-flags CPRNG_USE_CV)) {
+ len = 0;
+ break;
+}
+ /*
+ * XXX There's a race with the cv_broadcast
+ * XXX in cprng_strong_sched_reseed, because
+ * XXX of the use of tryenter in that function.
+ * XXX This timedwait hack works around it,
+ * XXX at the expense of occasionaly polling
+ * XXX for success on a /dev/random rekey.
+ */
+wr = cv_timedwait_sig(c-cv, c-mtx,
+ mstohz(100));
+if (wr == ERESTART) {
+ mutex_exit(c-mtx);
+ return 0;
+}
+ } while (nist_ctr_drbg_generate(c-drbg, p,
+ len, cc,
+ sizeof(cc)));
}
}
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat May 19 16:25:56 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.1.2.160 -r1.1.2.161 src/doc/CHANGES-5.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.2 diff -u src/doc/CHANGES-5.2:1.1.2.160 src/doc/CHANGES-5.2:1.1.2.161 --- src/doc/CHANGES-5.2:1.1.2.160 Tue May 8 12:12:19 2012 +++ src/doc/CHANGES-5.2 Sat May 19 16:25:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.160 2012/05/08 12:12:19 sborrill Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.161 2012/05/19 16:25:55 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6301,6 +6301,7 @@ src/sys/arch/i386/include/segments.h pa signal handlers would have the wrong %fs/%gs. Found by running atf tests under Xen/i386. [bouyer, ticket #1738] + sys/arch/hp700/hp700/intr.c 1.38 Check for HPPA_SID_KERNEL when checking for interrupt in the
CVS commit: [netbsd-5] src/crypto/dist/openssl/crypto/buffer
Module Name:src
Committed By: riz
Date: Sat May 19 16:28:15 UTC 2012
Modified Files:
src/crypto/dist/openssl/crypto/buffer [netbsd-5]: buffer.c
Log Message:
crypto/dist/openssl/crypto/buffer/buffer.c patch
Minor error code fix for ticket #1750.
[drochner, ticket #1752]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.4.1 -r1.1.1.5.4.2 \
src/crypto/dist/openssl/crypto/buffer/buffer.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/buffer/buffer.c
diff -u src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.4.1 src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.4.2
--- src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.4.1 Sat Apr 21 15:52:54 2012
+++ src/crypto/dist/openssl/crypto/buffer/buffer.c Sat May 19 16:28:15 2012
@@ -156,7 +156,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, siz
/* This limit is sufficient to ensure (len+3)/3*4 2**31 */
if (len LIMIT_BEFORE_EXPANSION)
{
- BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+ BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
return 0;
}
n=(len+3)/3*4;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat May 19 16:28:46 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1752. To generate a diff of this commit: cvs rdiff -u -r1.1.2.161 -r1.1.2.162 src/doc/CHANGES-5.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.2 diff -u src/doc/CHANGES-5.2:1.1.2.161 src/doc/CHANGES-5.2:1.1.2.162 --- src/doc/CHANGES-5.2:1.1.2.161 Sat May 19 16:25:55 2012 +++ src/doc/CHANGES-5.2 Sat May 19 16:28:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.161 2012/05/19 16:25:55 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.162 2012/05/19 16:28:46 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6342,3 +6342,8 @@ sys/arch/xen/xen/hypervisor.c 1.62 via Retrieve and print the hypervisor extra (teeny) version. [riz, ticket #1748] +crypto/dist/openssl/crypto/buffer/buffer.c patch + + Minor error code fix for ticket #1750. + [drochner, ticket #1752] +
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/crypto/buffer
Module Name:src
Committed By: riz
Date: Sat May 19 16:29:58 UTC 2012
Modified Files:
src/crypto/dist/openssl/crypto/buffer [netbsd-5-0]: buffer.c
Log Message:
crypto/dist/openssl/crypto/buffer/buffer.c patch
Minor error code fix for ticket #1750.
[drochner, ticket #1752]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.2 \
src/crypto/dist/openssl/crypto/buffer/buffer.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/buffer/buffer.c
diff -u src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.8.1 src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.8.2
--- src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.8.1 Sat Apr 21 15:54:03 2012
+++ src/crypto/dist/openssl/crypto/buffer/buffer.c Sat May 19 16:29:58 2012
@@ -156,7 +156,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, siz
/* This limit is sufficient to ensure (len+3)/3*4 2**31 */
if (len LIMIT_BEFORE_EXPANSION)
{
- BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+ BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
return 0;
}
n=(len+3)/3*4;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Sat May 19 16:30:23 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1752. To generate a diff of this commit: cvs rdiff -u -r1.1.2.71 -r1.1.2.72 src/doc/CHANGES-5.0.3 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.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.71 src/doc/CHANGES-5.0.3:1.1.2.72 --- src/doc/CHANGES-5.0.3:1.1.2.71 Sat Apr 21 23:12:17 2012 +++ src/doc/CHANGES-5.0.3 Sat May 19 16:30:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.71 2012/04/21 23:12:17 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.72 2012/05/19 16:30:23 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3012,3 +3012,8 @@ crypto/dist/openssl/crypto/buffer/buffer Address CVE-2012-2110. [spz, ticket #1750] +crypto/dist/openssl/crypto/buffer/buffer.c patch + + Minor error code fix for ticket #1750. + [drochner, ticket #1752] +
CVS commit: [netbsd-5-1] src/crypto/dist/openssl/crypto/buffer
Module Name:src
Committed By: riz
Date: Sat May 19 16:30:49 UTC 2012
Modified Files:
src/crypto/dist/openssl/crypto/buffer [netbsd-5-1]: buffer.c
Log Message:
crypto/dist/openssl/crypto/buffer/buffer.c patch
Minor error code fix for ticket #1750.
[drochner, ticket #1752]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.12.1 -r1.1.1.5.12.2 \
src/crypto/dist/openssl/crypto/buffer/buffer.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/buffer/buffer.c
diff -u src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.12.1 src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.12.2
--- src/crypto/dist/openssl/crypto/buffer/buffer.c:1.1.1.5.12.1 Sat Apr 21 15:54:46 2012
+++ src/crypto/dist/openssl/crypto/buffer/buffer.c Sat May 19 16:30:49 2012
@@ -156,7 +156,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, siz
/* This limit is sufficient to ensure (len+3)/3*4 2**31 */
if (len LIMIT_BEFORE_EXPANSION)
{
- BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+ BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
return 0;
}
n=(len+3)/3*4;
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Sat May 19 16:31:10 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1752. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-5.1.3 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.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.12 src/doc/CHANGES-5.1.3:1.1.2.13 --- src/doc/CHANGES-5.1.3:1.1.2.12 Sat Apr 21 23:11:42 2012 +++ src/doc/CHANGES-5.1.3 Sat May 19 16:31:10 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.12 2012/04/21 23:11:42 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.13 2012/05/19 16:31:10 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -98,3 +98,8 @@ crypto/dist/openssl/crypto/buffer/buffer Address CVE-2012-2110. [spz, ticket #1750] +crypto/dist/openssl/crypto/buffer/buffer.c patch + + Minor error code fix for ticket #1750. + [drochner, ticket #1752] +
CVS commit: [netbsd-5] src/lib/libpthread
Module Name:src
Committed By: riz
Date: Sat May 19 16:34:15 UTC 2012
Modified Files:
src/lib/libpthread [netbsd-5]: pthread.c
Log Message:
Pull up following revision(s) (requested by enami in ticket #1753):
lib/libpthread/pthread.c: revision 1.134
Store allocated lwpctl state in the thread actually forked,
which is the only thread lives in the child process.
The problem originally reported here:
https://bugs.ruby-lang.org/issues/6341
To generate a diff of this commit:
cvs rdiff -u -r1.106.2.3 -r1.106.2.4 src/lib/libpthread/pthread.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/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.106.2.3 src/lib/libpthread/pthread.c:1.106.2.4
--- src/lib/libpthread/pthread.c:1.106.2.3 Thu May 20 05:02:07 2010
+++ src/lib/libpthread/pthread.c Sat May 19 16:34:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.106.2.3 2010/05/20 05:02:07 snj Exp $ */
+/* $NetBSD: pthread.c,v 1.106.2.4 2012/05/19 16:34:15 riz Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread.c,v 1.106.2.3 2010/05/20 05:02:07 snj Exp $);
+__RCSID($NetBSD: pthread.c,v 1.106.2.4 2012/05/19 16:34:15 riz Exp $);
#define __EXPOSE_STACK 1
@@ -82,7 +82,6 @@ pthread_queue_t pthread__allqueue;
static pthread_attr_t pthread_default_attr;
static lwpctl_t pthread__dummy_lwpctl = { .lc_curcpu = LWPCTL_CPU_NONE };
-static pthread_t pthread__first;
enum {
DIAGASSERT_ABORT = 10,
@@ -232,7 +231,6 @@ pthread__init(void)
}
/* Tell libc that we're here and it should role-play accordingly. */
- pthread__first = first;
pthread_atfork(NULL, NULL, pthread__fork_callback);
__isthreaded = 1;
}
@@ -240,13 +238,12 @@ pthread__init(void)
static void
pthread__fork_callback(void)
{
- struct __pthread_st *self;
+ struct __pthread_st *self = pthread__self();
/* lwpctl state is not copied across fork. */
- if (_lwp_ctl(LWPCTL_FEATURE_CURCPU, pthread__first-pt_lwpctl)) {
+ if (_lwp_ctl(LWPCTL_FEATURE_CURCPU, self-pt_lwpctl)) {
err(1, _lwp_ctl);
}
- self = pthread__self();
self-pt_lid = _lwp_self();
}
CVS commit: [netbsd-5] src/sys/arch
Module Name:src
Committed By: riz
Date: Sat May 19 16:37:14 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-5]: db_memrw.c
src/sys/arch/i386/i386 [netbsd-5]: db_memrw.c
Log Message:
Pull up following revision(s) (requested by jym in ticket #1754):
sys/arch/amd64/amd64/db_memrw.c: revision 1.10
sys/arch/amd64/amd64/db_memrw.c: revision 1.11
sys/arch/i386/i386/db_memrw.c: revision 1.29
Use the current destination address to compute PTE, not the address of
origin.
Harmless, except when db_write_text() passes a page boundary.
From Bug Hunting.
XXX has to be pulled up to -5 and -6.
invlpg on a non canonical address is a noop, so no chance to invalidate
the TLB and the CPU will not notice the access right change.
This results in write protection faults in supervisor mode when patching
kernel code through ddb(4) (originally mapped as read only).
Bug reported by David Laight on port-amd64@ (thanks!), patch and test by
me.
i386 is unaffected as PG_LGFRAME does not mask the sign bits. For the
sake of correctness, use VA_SIGN_NEG(...) anyway.
XXX this is the patch that will be pulled-up to -5 and -6.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.10.1 src/sys/arch/amd64/amd64/db_memrw.c
cvs rdiff -u -r1.24.10.1 -r1.24.10.2 src/sys/arch/i386/i386/db_memrw.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/amd64/amd64/db_memrw.c
diff -u src/sys/arch/amd64/amd64/db_memrw.c:1.6 src/sys/arch/amd64/amd64/db_memrw.c:1.6.10.1
--- src/sys/arch/amd64/amd64/db_memrw.c:1.6 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amd64/amd64/db_memrw.c Sat May 19 16:37:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.6 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: db_memrw.c,v 1.6.10.1 2012/05/19 16:37:14 riz Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.6 2008/04/28 20:23:12 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.6.10.1 2012/05/19 16:37:14 riz Exp $);
#include opt_xen.h
@@ -115,7 +115,7 @@ db_write_text(vaddr_t addr, size_t size,
/*
* Get the PTE for the page.
*/
- pte = kvtopte(addr);
+ pte = kvtopte((vaddr_t)dst);
oldpte = *pte;
if ((oldpte PG_V) == 0) {
@@ -127,7 +127,7 @@ db_write_text(vaddr_t addr, size_t size,
* Get the VA for the page.
*/
if (oldpte PG_PS)
- pgva = (vaddr_t)dst PG_LGFRAME;
+ pgva = VA_SIGN_NEG((vaddr_t)dst PG_LGFRAME);
else
pgva = x86_trunc_page(dst);
Index: src/sys/arch/i386/i386/db_memrw.c
diff -u src/sys/arch/i386/i386/db_memrw.c:1.24.10.1 src/sys/arch/i386/i386/db_memrw.c:1.24.10.2
--- src/sys/arch/i386/i386/db_memrw.c:1.24.10.1 Wed Sep 30 00:08:03 2009
+++ src/sys/arch/i386/i386/db_memrw.c Sat May 19 16:37:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.24.10.1 2009/09/30 00:08:03 snj Exp $ */
+/* $NetBSD: db_memrw.c,v 1.24.10.2 2012/05/19 16:37:14 riz Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.24.10.1 2009/09/30 00:08:03 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.24.10.2 2012/05/19 16:37:14 riz Exp $);
#include opt_xen.h
@@ -111,7 +111,7 @@ db_write_text(vaddr_t addr, size_t size,
/*
* Get the PTE for the page.
*/
- pte = kvtopte(addr);
+ pte = kvtopte((vaddr_t)dst);
oldpte = *pte;
if ((oldpte PG_V) == 0) {
CVS commit: [netbsd-5] src/sys/arch/x86/pci
Module Name:src
Committed By: riz
Date: Sat May 19 16:39:24 UTC 2012
Modified Files:
src/sys/arch/x86/pci [netbsd-5]: pci_machdep.c
Log Message:
Pull up following revision(s) (requested by gendalia in ticket #1755):
sys/arch/x86/pci/pci_machdep.c: revision 1.36
add SIS 740 to the list of chipsets known to implement PCI configuration
mode 1 incorrectly, from Jason White
(see thread ACPI issue with old Shuttle system on port-i386)
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.10.1 src/sys/arch/x86/pci/pci_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/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.34 src/sys/arch/x86/pci/pci_machdep.c:1.34.10.1
--- src/sys/arch/x86/pci/pci_machdep.c:1.34 Mon Apr 28 20:23:40 2008
+++ src/sys/arch/x86/pci/pci_machdep.c Sat May 19 16:39:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.34 2008/04/28 20:23:40 martin Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.34.10.1 2012/05/19 16:39:24 riz Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.34 2008/04/28 20:23:40 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.34.10.1 2012/05/19 16:39:24 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -168,6 +168,8 @@ struct {
/* Parallels Desktop for Mac */
_qe(0, 2, 0, PCI_VENDOR_PARALLELS, PCI_PRODUCT_PARALLELS_VIDEO),
_qe(0, 3, 0, PCI_VENDOR_PARALLELS, PCI_PRODUCT_PARALLELS_TOOLS),
+ /* SIS 740 */
+ _qe(0, 0, 0, PCI_VENDOR_SIS, PCI_PRODUCT_SIS_740),
/* SIS 741 */
_qe(0, 0, 0, PCI_VENDOR_SIS, PCI_PRODUCT_SIS_741),
{0, 0x} /* patchable */
CVS commit: [netbsd-5] src
Module Name:src
Committed By: riz
Date: Sat May 19 16:48:36 UTC 2012
Modified Files:
src/etc/rc.d [netbsd-5]: staticroute
src/share/man/man5 [netbsd-5]: route.conf.5
Log Message:
Pull up following revision(s) (requested by gendalia in ticket #1757):
share/man/man5/route.conf.5: revision 1.4
etc/rc.d/staticroute: revision 1.4
etc/rc.d/staticroute: revision 1.5
etc/rc.d/staticroute: revision 1.6
Add a return 0 to avoid incorrect error returns because we ran out of
lines to read from /etc/route.conf.
Add proper error reporting via the return code:
Remember if any of the route commands failed and return an error in
that case.
Add the ability for staticroute to evaluate lines from /etc/route.conf
as shell script fragments, add example to the route.conf man page of
evaluating variables.
Remove route.conf man page statement that staticroute is enabled in
rc.conf since that's incorrect.
Wrap the staticroute while in parens, per apb christos, and
quote all the arguments for the evals.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 src/etc/rc.d/staticroute
cvs rdiff -u -r1.3 -r1.3.2.1 src/share/man/man5/route.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/staticroute
diff -u src/etc/rc.d/staticroute:1.3 src/etc/rc.d/staticroute:1.3.12.1
--- src/etc/rc.d/staticroute:1.3 Thu Jan 31 15:21:32 2008
+++ src/etc/rc.d/staticroute Sat May 19 16:48:36 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: staticroute,v 1.3 2008/01/31 15:21:32 reed Exp $
+# $NetBSD: staticroute,v 1.3.12.1 2012/05/19 16:48:36 riz Exp $
#
# PROVIDE: staticroute
@@ -16,25 +16,36 @@ start_cmd=staticroute_doit Adding add
stop_cmd=staticroute_doit Deleting delete
staticroute_doit() {
+ retval=0
+
if [ -s /etc/route.conf ]; then
echo $1 static routes.
- while read args; do
+ ( while read args; do
[ -z $args ] continue
case $args in
#*)
;;
+*)
-[ $2 = add ] eval ${args#*+}
+if [ $2 = add ]; then
+ eval ${args#*+} || retval=1
+fi
;;
-*)
-[ $2 = delete ] eval ${args#*-}
+if [ $2 = delete ]; then
+ eval ${args#*-} || retval=1
+fi
+;;
+ !*)
+eval ${args#*!} || retval=1
;;
*)
-route -q $2 -$args
+eval route -q $2 -$args || retval=1
;;
esac
- done /etc/route.conf
+ done /etc/route.conf )
fi
+
+ return $retval
}
load_rc_config $name
Index: src/share/man/man5/route.conf.5
diff -u src/share/man/man5/route.conf.5:1.3 src/share/man/man5/route.conf.5:1.3.2.1
--- src/share/man/man5/route.conf.5:1.3 Thu May 8 15:34:39 2008
+++ src/share/man/man5/route.conf.5 Sat May 19 16:48:36 2012
@@ -1,4 +1,4 @@
-.\$NetBSD: route.conf.5,v 1.3 2008/05/08 15:34:39 wiz Exp $
+.\$NetBSD: route.conf.5,v 1.3.2.1 2012/05/19 16:48:36 riz Exp $
.\
.\ Copyright (c) 2004 Thomas Klausner
.\ All rights reserved.
@@ -23,7 +23,7 @@
.\ INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd June 24, 2004
+.Dd May 1, 2012
.Dt ROUTE.CONF 5
.Os
.Sh NAME
@@ -46,6 +46,9 @@ are run during start-up,
while lines starting with a minus sign
.Pq Sq \-
are run during system shutdown.
+If a line starts with a
+.Sq \! ,
+the rest of the line will get evaluated as a shell script fragment.
All other lines are passed to
.Xr route 8 .
During start-up, they are passed behind a
@@ -66,10 +69,17 @@ script that parses
.Nm .
.El
.Sh EXAMPLES
-In this example, if the
-.Pa staticroute
-script is enabled in
-.Xr rc.conf 5 ,
+In this example, the interface for the desired routing changes is set,
+the IP address on that interface is determined, and a route is added
+during startup, or deleted during system shutdown.
+.Bd -literal -offset indent
+# Set interface and determine current IP address for added route.
+!ifname=bnx0
+!ipaddr=$(/sbin/ifconfig ${ifname} | awk '$1 == inet {print $2}')
+net 10.10.1 -interface ${ipaddr}
+.Ed
+.Pp
+In this example,
IP forwarding is turned on during
start-up, and a static route added for 192.168.2.0.
During system shutdown, the route is removed
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat May 19 16:51:18 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1753-1755,1757. To generate a diff of this commit: cvs rdiff -u -r1.1.2.162 -r1.1.2.163 src/doc/CHANGES-5.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.2 diff -u src/doc/CHANGES-5.2:1.1.2.162 src/doc/CHANGES-5.2:1.1.2.163 --- src/doc/CHANGES-5.2:1.1.2.162 Sat May 19 16:28:46 2012 +++ src/doc/CHANGES-5.2 Sat May 19 16:51:18 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.162 2012/05/19 16:28:46 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.163 2012/05/19 16:51:18 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6347,3 +6347,32 @@ crypto/dist/openssl/crypto/buffer/buffer Minor error code fix for ticket #1750. [drochner, ticket #1752] +lib/libpthread/pthread.c 1.134 + + Store allocated lwpctl state in the thread actually forked, + which is the only thread lives in the child process. + The problem originally reported here: + https://bugs.ruby-lang.org/issues/6341 + [enami, ticket #1753] + +sys/arch/amd64/amd64/db_memrw.c 1.10-1.11 via patch +sys/arch/i386/i386/db_memrw.c 1.29 via patch + + Fix a bug in db_write_text() function that prohibits its use + for code that spans multiple pages. + [jym, ticket #1754] + +sys/arch/x86/pci/pci_machdep.c 1.36 + + Add SIS 740 to the list of chipsets known to implement PCI + configuration mode 1 incorrectly. + [gendalia, ticket #1755] + +etc/rc.d/staticroute1.4-1.6 +share/man/man5/route.conf.5 1.4 + + Add the ability for staticroute to evaluate lines from /etc/route.conf + as shell script fragments, add example to the route.conf man page of + evaluating variables. + [gendalia, ticket #1757] +
CVS commit: [netbsd-5] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 17:03:09 UTC 2012 Modified Files: src/sys/netsmb [netbsd-5]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1758): sys/netsmb/subr_mchain.c: revision 1.21 Since len has changed to (unsinged) size_t, the while loop condition (len 0) became less able to detect its underflow. So check the subtrahend to avoid the underflow. Should fix PR kern/44092. To generate a diff of this commit: cvs rdiff -u -r1.15.6.1 -r1.15.6.2 src/sys/netsmb/subr_mchain.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/netsmb/subr_mchain.c diff -u src/sys/netsmb/subr_mchain.c:1.15.6.1 src/sys/netsmb/subr_mchain.c:1.15.6.2 --- src/sys/netsmb/subr_mchain.c:1.15.6.1 Fri Jul 16 18:47:10 2010 +++ src/sys/netsmb/subr_mchain.c Sat May 19 17:03:09 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_mchain.c,v 1.15.6.1 2010/07/16 18:47:10 riz Exp $ */ +/* $NetBSD: subr_mchain.c,v 1.15.6.2 2012/05/19 17:03:09 riz Exp $ */ /* * Copyright (c) 2000, 2001 Boris Popov @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.15.6.1 2010/07/16 18:47:10 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.15.6.2 2012/05/19 17:03:09 riz Exp $); #include sys/param.h #include sys/systm.h @@ -67,7 +67,7 @@ m_getm(struct mbuf *m, size_t len, int h } } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); if (m != NULL) for (mtail = m; mtail-m_next != NULL; mtail = mtail-m_next); @@ -89,7 +89,7 @@ m_getm(struct mbuf *m, size_t len, int h } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); } if (mtail != NULL)
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat May 19 17:03:33 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1758. To generate a diff of this commit: cvs rdiff -u -r1.1.2.163 -r1.1.2.164 src/doc/CHANGES-5.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.2 diff -u src/doc/CHANGES-5.2:1.1.2.163 src/doc/CHANGES-5.2:1.1.2.164 --- src/doc/CHANGES-5.2:1.1.2.163 Sat May 19 16:51:18 2012 +++ src/doc/CHANGES-5.2 Sat May 19 17:03:32 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.163 2012/05/19 16:51:18 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.164 2012/05/19 17:03:32 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6376,3 +6376,9 @@ share/man/man5/route.conf.5 1.4 evaluating variables. [gendalia, ticket #1757] +sys/netsmb/subr_mchain.c 1.21 + + Fix a regression introduced in netsmb by ticket #1426. + PR#44092. + [nakayama, ticket #1758] +
CVS commit: [netbsd-5-0] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 17:03:45 UTC 2012 Modified Files: src/sys/netsmb [netbsd-5-0]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1758): sys/netsmb/subr_mchain.c: revision 1.21 Since len has changed to (unsinged) size_t, the while loop condition (len 0) became less able to detect its underflow. So check the subtrahend to avoid the underflow. Should fix PR kern/44092. To generate a diff of this commit: cvs rdiff -u -r1.15.12.1 -r1.15.12.2 src/sys/netsmb/subr_mchain.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/netsmb/subr_mchain.c diff -u src/sys/netsmb/subr_mchain.c:1.15.12.1 src/sys/netsmb/subr_mchain.c:1.15.12.2 --- src/sys/netsmb/subr_mchain.c:1.15.12.1 Fri Jul 16 18:48:41 2010 +++ src/sys/netsmb/subr_mchain.c Sat May 19 17:03:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_mchain.c,v 1.15.12.1 2010/07/16 18:48:41 riz Exp $ */ +/* $NetBSD: subr_mchain.c,v 1.15.12.2 2012/05/19 17:03:45 riz Exp $ */ /* * Copyright (c) 2000, 2001 Boris Popov @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.15.12.1 2010/07/16 18:48:41 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.15.12.2 2012/05/19 17:03:45 riz Exp $); #include sys/param.h #include sys/systm.h @@ -67,7 +67,7 @@ m_getm(struct mbuf *m, size_t len, int h } } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); if (m != NULL) for (mtail = m; mtail-m_next != NULL; mtail = mtail-m_next); @@ -89,7 +89,7 @@ m_getm(struct mbuf *m, size_t len, int h } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); } if (mtail != NULL)
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Sat May 19 17:04:02 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1758. To generate a diff of this commit: cvs rdiff -u -r1.1.2.72 -r1.1.2.73 src/doc/CHANGES-5.0.3 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.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.72 src/doc/CHANGES-5.0.3:1.1.2.73 --- src/doc/CHANGES-5.0.3:1.1.2.72 Sat May 19 16:30:23 2012 +++ src/doc/CHANGES-5.0.3 Sat May 19 17:04:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.72 2012/05/19 16:30:23 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.73 2012/05/19 17:04:02 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3017,3 +3017,9 @@ crypto/dist/openssl/crypto/buffer/buffer Minor error code fix for ticket #1750. [drochner, ticket #1752] +sys/netsmb/subr_mchain.c 1.21 + + Fix a regression introduced in netsmb by ticket #1426. + PR#44092. + [nakayama, ticket #1758] +
CVS commit: [netbsd-5-1] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 17:04:19 UTC 2012 Modified Files: src/sys/netsmb [netbsd-5-1]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1758): sys/netsmb/subr_mchain.c: revision 1.21 Since len has changed to (unsinged) size_t, the while loop condition (len 0) became less able to detect its underflow. So check the subtrahend to avoid the underflow. Should fix PR kern/44092. To generate a diff of this commit: cvs rdiff -u -r1.15.6.1 -r1.15.6.1.2.1 src/sys/netsmb/subr_mchain.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/netsmb/subr_mchain.c diff -u src/sys/netsmb/subr_mchain.c:1.15.6.1 src/sys/netsmb/subr_mchain.c:1.15.6.1.2.1 --- src/sys/netsmb/subr_mchain.c:1.15.6.1 Fri Jul 16 18:47:10 2010 +++ src/sys/netsmb/subr_mchain.c Sat May 19 17:04:19 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_mchain.c,v 1.15.6.1 2010/07/16 18:47:10 riz Exp $ */ +/* $NetBSD: subr_mchain.c,v 1.15.6.1.2.1 2012/05/19 17:04:19 riz Exp $ */ /* * Copyright (c) 2000, 2001 Boris Popov @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.15.6.1 2010/07/16 18:47:10 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.15.6.1.2.1 2012/05/19 17:04:19 riz Exp $); #include sys/param.h #include sys/systm.h @@ -67,7 +67,7 @@ m_getm(struct mbuf *m, size_t len, int h } } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); if (m != NULL) for (mtail = m; mtail-m_next != NULL; mtail = mtail-m_next); @@ -89,7 +89,7 @@ m_getm(struct mbuf *m, size_t len, int h } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); } if (mtail != NULL)
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Sat May 19 17:04:36 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1758. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-5.1.3 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.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.13 src/doc/CHANGES-5.1.3:1.1.2.14 --- src/doc/CHANGES-5.1.3:1.1.2.13 Sat May 19 16:31:10 2012 +++ src/doc/CHANGES-5.1.3 Sat May 19 17:04:35 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.13 2012/05/19 16:31:10 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.14 2012/05/19 17:04:35 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -103,3 +103,9 @@ crypto/dist/openssl/crypto/buffer/buffer Minor error code fix for ticket #1750. [drochner, ticket #1752] +sys/netsmb/subr_mchain.c 1.21 + + Fix a regression introduced in netsmb by ticket #1426. + PR#44092. + [nakayama, ticket #1758] +
CVS commit: [netbsd-4] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 17:06:49 UTC 2012 Modified Files: src/sys/netsmb [netbsd-4]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1445): sys/netsmb/subr_mchain.c: revision 1.21 Since len has changed to (unsinged) size_t, the while loop condition (len 0) became less able to detect its underflow. So check the subtrahend to avoid the underflow. Should fix PR kern/44092. To generate a diff of this commit: cvs rdiff -u -r1.13.18.1 -r1.13.18.2 src/sys/netsmb/subr_mchain.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/netsmb/subr_mchain.c diff -u src/sys/netsmb/subr_mchain.c:1.13.18.1 src/sys/netsmb/subr_mchain.c:1.13.18.2 --- src/sys/netsmb/subr_mchain.c:1.13.18.1 Thu Jul 22 20:36:22 2010 +++ src/sys/netsmb/subr_mchain.c Sat May 19 17:06:48 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_mchain.c,v 1.13.18.1 2010/07/22 20:36:22 riz Exp $ */ +/* $NetBSD: subr_mchain.c,v 1.13.18.2 2012/05/19 17:06:48 riz Exp $ */ /* * Copyright (c) 2000, 2001 Boris Popov @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.13.18.1 2010/07/22 20:36:22 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.13.18.2 2012/05/19 17:06:48 riz Exp $); #include sys/param.h #include sys/systm.h @@ -70,7 +70,7 @@ m_getm(struct mbuf *m, size_t len, int h } } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); if (m != NULL) for (mtail = m; mtail-m_next != NULL; mtail = mtail-m_next); @@ -92,7 +92,7 @@ m_getm(struct mbuf *m, size_t len, int h } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); } if (mtail != NULL)
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Sat May 19 17:07:35 UTC 2012 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: TIcket 1445. To generate a diff of this commit: cvs rdiff -u -r1.1.2.237 -r1.1.2.238 src/doc/CHANGES-4.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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.237 src/doc/CHANGES-4.1:1.1.2.238 --- src/doc/CHANGES-4.1:1.1.2.237 Fri May 11 17:18:08 2012 +++ src/doc/CHANGES-4.1 Sat May 19 17:07:34 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.237 2012/05/11 17:18:08 riz Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.238 2012/05/19 17:07:34 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4625,3 +4625,9 @@ crypto/dist/openssl/crypto/buffer/buffer Address CVE-2012-2110. [drochner, ticket #1444] +sys/netsmb/subr_mchain.c 1.21 + + Fix an smbfs regression introduced in ticket #1398. + PR#44092. + [nakayama, ticket #1445] +
CVS commit: [netbsd-4-0] src/sys/netsmb
Module Name:src Committed By: riz Date: Sat May 19 17:07:50 UTC 2012 Modified Files: src/sys/netsmb [netbsd-4-0]: subr_mchain.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1445): sys/netsmb/subr_mchain.c: revision 1.21 Since len has changed to (unsinged) size_t, the while loop condition (len 0) became less able to detect its underflow. So check the subtrahend to avoid the underflow. Should fix PR kern/44092. To generate a diff of this commit: cvs rdiff -u -r1.13.28.1 -r1.13.28.2 src/sys/netsmb/subr_mchain.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/netsmb/subr_mchain.c diff -u src/sys/netsmb/subr_mchain.c:1.13.28.1 src/sys/netsmb/subr_mchain.c:1.13.28.2 --- src/sys/netsmb/subr_mchain.c:1.13.28.1 Thu Jul 22 20:34:16 2010 +++ src/sys/netsmb/subr_mchain.c Sat May 19 17:07:50 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_mchain.c,v 1.13.28.1 2010/07/22 20:34:16 riz Exp $ */ +/* $NetBSD: subr_mchain.c,v 1.13.28.2 2012/05/19 17:07:50 riz Exp $ */ /* * Copyright (c) 2000, 2001 Boris Popov @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.13.28.1 2010/07/22 20:34:16 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_mchain.c,v 1.13.28.2 2012/05/19 17:07:50 riz Exp $); #include sys/param.h #include sys/systm.h @@ -70,7 +70,7 @@ m_getm(struct mbuf *m, size_t len, int h } } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); if (m != NULL) for (mtail = m; mtail-m_next != NULL; mtail = mtail-m_next); @@ -92,7 +92,7 @@ m_getm(struct mbuf *m, size_t len, int h } mp-m_len = 0; -len -= M_TRAILINGSPACE(mp); +len -= min(len, M_TRAILINGSPACE(mp)); } if (mtail != NULL)
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat May 19 17:29:01 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1759. To generate a diff of this commit: cvs rdiff -u -r1.1.2.164 -r1.1.2.165 src/doc/CHANGES-5.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.2 diff -u src/doc/CHANGES-5.2:1.1.2.164 src/doc/CHANGES-5.2:1.1.2.165 --- src/doc/CHANGES-5.2:1.1.2.164 Sat May 19 17:03:32 2012 +++ src/doc/CHANGES-5.2 Sat May 19 17:29:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.164 2012/05/19 17:03:32 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.165 2012/05/19 17:29:01 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6382,3 +6382,13 @@ sys/netsmb/subr_mchain.c 1.21 PR#44092. [nakayama, ticket #1758] +sys/ufs/lfs/lfs_vnops.cpatch +sys/ufs/ufs/inode.h patch +sys/ufs/ufs/ufs_extern.h patch +sys/ufs/ufs/ufs_lookup.c patch +sys/ufs/ufs/ufs_vnops.cpatch +sys/ufs/ufs/ufs_wapbl.cpatch + + Port dholland's ufs_rename locking changes to netbsd-5. + [buhrow, ticket #1759] +
CVS commit: [netbsd-6] src/usr.bin/login
Module Name:src
Committed By: riz
Date: Sat May 19 17:32:46 UTC 2012
Modified Files:
src/usr.bin/login [netbsd-6]: common.c common.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #271):
usr.bin/login/common.c: revision 1.6
usr.bin/login/common.h: revision 1.4
- use __dead consistently.
- more clang build.
- use __dead consistently.
- more clang build.
To generate a diff of this commit:
cvs rdiff -u -r1.3.8.2 -r1.3.8.3 src/usr.bin/login/common.c
cvs rdiff -u -r1.1.8.1 -r1.1.8.2 src/usr.bin/login/common.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.bin/login/common.c
diff -u src/usr.bin/login/common.c:1.3.8.2 src/usr.bin/login/common.c:1.3.8.3
--- src/usr.bin/login/common.c:1.3.8.2 Fri May 18 17:02:31 2012
+++ src/usr.bin/login/common.c Sat May 19 17:32:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.3.8.2 2012/05/18 17:02:31 riz Exp $ */
+/* $NetBSD: common.c,v 1.3.8.3 2012/05/19 17:32:46 riz Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: common.c,v 1.3.8.2 2012/05/18 17:02:31 riz Exp $);
+__RCSID($NetBSD: common.c,v 1.3.8.3 2012/05/19 17:32:46 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -155,7 +155,7 @@ sigint(int signo)
}
/* ARGSUSED */
-void
+void __dead
timedout(int signo)
{
@@ -372,7 +372,7 @@ stypeof(const char *ttyid)
return (ttyid (t = getttynam(ttyid)) ? t-ty_type : NULL);
}
-void
+void __dead
sleepexit(int eval)
{
Index: src/usr.bin/login/common.h
diff -u src/usr.bin/login/common.h:1.1.8.1 src/usr.bin/login/common.h:1.1.8.2
--- src/usr.bin/login/common.h:1.1.8.1 Mon May 7 16:24:07 2012
+++ src/usr.bin/login/common.h Sat May 19 17:32:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.1.8.1 2012/05/07 16:24:07 riz Exp $ */
+/* $NetBSD: common.h,v 1.1.8.2 2012/05/19 17:32:46 riz Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -37,10 +37,10 @@ char *trimloginname(char *);
char *getloginname(void);
void motd(const char *);
int rootterm(char *);
-void sigint(int);
-void sleepexit(int);
+void __dead sigint(int);
+void __dead sleepexit(int);
const char *stypeof(const char *);
-void timedout(int);
+void __dead timedout(int);
void decode_ss(const char *);
extern u_int timeout;
