CVS commit: src/sys/sys
Module Name:src Committed By: pgoyette Date: Mon Jul 15 19:34:45 UTC 2019 Modified Files: src/sys/sys: proc.h Log Message: Move a comment line get it next to the line it describes, avoiding intervening unrelated text. NFCI To generate a diff of this commit: cvs rdiff -u -r1.354 -r1.355 src/sys/sys/proc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: pgoyette
Date: Mon Jul 15 19:34:45 UTC 2019
Modified Files:
src/sys/sys: proc.h
Log Message:
Move a comment line get it next to the line it describes, avoiding
intervening unrelated text.
NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.354 -r1.355 src/sys/sys/proc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.354 src/sys/sys/proc.h:1.355
--- src/sys/sys/proc.h:1.354 Fri Jun 21 01:03:51 2019
+++ src/sys/sys/proc.h Mon Jul 15 19:34:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.354 2019/06/21 01:03:51 kamil Exp $ */
+/* $NetBSD: proc.h,v 1.355 2019/07/15 19:34:45 pgoyette Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -153,8 +153,8 @@ struct emul {
const uint32_t *e_nomodbits; /* sys_nosys/sys_nomodule flags
* for syscall_disestablish() */
const char * const *e_syscallnames; /* System call name array */
+ struct sc_autoload *e_sc_autoload; /* List of autoloadable syscalls */
/* Signal sending function */
- struct sc_autoload *e_sc_autoload; /* List of autoloadable syscalls */
void (*e_sendsig)(const struct ksiginfo *,
const sigset_t *);
void (*e_trapsignal)(struct lwp *, struct ksiginfo *);
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Mon Jul 15 19:13:05 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: Don't overwrite the filesystem type unconditionally with the FFSv1 or v2 setup for an architectures default - now we have /tmp on tmpfs back. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/sysinst/bsddisklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Jul 15 19:13:05 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
Don't overwrite the filesystem type unconditionally with the FFSv1 or v2
setup for an architectures default - now we have /tmp on tmpfs back.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/sysinst/bsddisklabel.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/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.20 src/usr.sbin/sysinst/bsddisklabel.c:1.21
--- src/usr.sbin/sysinst/bsddisklabel.c:1.20 Sun Jul 14 11:26:18 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Mon Jul 15 19:13:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.20 2019/07/14 11:26:18 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.21 2019/07/15 19:13:05 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1025,13 +1025,16 @@ fill_defaults(struct partition_usage_set
else
def_usr = i;
}
- wanted->infos[i].fs_type = FS_BSDFFS;
+ if (wanted->infos[i].fs_type == FS_UNUSED)
+wanted->infos[i].fs_type = FS_BSDFFS;
+ if (wanted->infos[i].fs_type == FS_BSDFFS) {
#ifdef DEFAULT_UFS2
#ifndef HAVE_UFS2_BOOT
- if (boot < wanted->num || i != root)
+if (boot < wanted->num || i != root)
#endif
-wanted->infos[i].fs_version = 2;
+ wanted->infos[i].fs_version = 2;
#endif
+ }
}
if ((wanted->infos[i].flags & PUIFLG_JUST_MOUNTPOINT) &&
wanted->infos[i].size == 0)
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Jul 15 17:17:59 UTC 2019
Modified Files:
src/usr.sbin/sysinst: partman.c
Log Message:
Fix partition size display
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/sysinst/partman.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/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.38 src/usr.sbin/sysinst/partman.c:1.39
--- src/usr.sbin/sysinst/partman.c:1.38 Sun Jul 14 16:12:02 2019
+++ src/usr.sbin/sysinst/partman.c Mon Jul 15 17:17:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.38 2019/07/14 16:12:02 martin Exp $ */
+/* $NetBSD: partman.c,v 1.39 2019/07/15 17:17:59 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -457,7 +457,8 @@ pm_fmt_disk_line(WINDOW *w, const char *
wprintw(w, " %-56s (%s)", line, no_size_display);
} else {
humanize_number(human, sizeof(human),
- total, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
+ total * 512, "",
+ HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
wprintw(w, " %-56s %s", line, human);
}
}
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Mon Jul 15 17:17:59 UTC 2019 Modified Files: src/usr.sbin/sysinst: partman.c Log Message: Fix partition size display To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/sysinst/partman.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Mon Jul 15 11:46:53 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
Log Message:
Fix a comment
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.37 src/sys/arch/aarch64/aarch64/locore.S:1.38
--- src/sys/arch/aarch64/aarch64/locore.S:1.37 Mon Jul 15 11:45:54 2019
+++ src/sys/arch/aarch64/aarch64/locore.S Mon Jul 15 11:46:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.37 2019/07/15 11:45:54 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.38 2019/07/15 11:46:53 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -38,7 +38,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.37 2019/07/15 11:45:54 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.38 2019/07/15 11:46:53 skrll Exp $")
/*#define DEBUG_LOCORE /* debug print */
@@ -826,7 +826,7 @@ init_mmutable:
mov x4, #LX_BLKPAG_ATTR_NORMAL_WB|LX_BLKPAG_AP_RW /* attr */
orr x4, x4, #LX_BLKPAG_UXN
mov x3, #L2_SIZE /* blocksize */
- adr x1, start /* va = start */
+ adr x1, start /* pa = start */
ADDR x2, _end
sub x2, x2, x1 /* size = _end - start */
ldr x0, =start /* va */
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Mon Jul 15 11:46:53 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: locore.S Log Message: Fix a comment To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/aarch64/aarch64/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Mon Jul 15 11:45:54 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: locore.S Log Message: Restore the comment against the line changed in the last commit To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/aarch64/aarch64/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Mon Jul 15 11:45:54 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
Log Message:
Restore the comment against the line changed in the last commit
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.36 src/sys/arch/aarch64/aarch64/locore.S:1.37
--- src/sys/arch/aarch64/aarch64/locore.S:1.36 Mon Jul 15 11:27:19 2019
+++ src/sys/arch/aarch64/aarch64/locore.S Mon Jul 15 11:45:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.36 2019/07/15 11:27:19 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.37 2019/07/15 11:45:54 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -38,7 +38,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.36 2019/07/15 11:27:19 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.37 2019/07/15 11:45:54 skrll Exp $")
/*#define DEBUG_LOCORE /* debug print */
@@ -829,7 +829,7 @@ init_mmutable:
adr x1, start /* va = start */
ADDR x2, _end
sub x2, x2, x1 /* size = _end - start */
- ldr x0, =start
+ ldr x0, =start /* va */
bl pmapboot_enter
cbnz x0, init_mmutable_error
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Mon Jul 15 11:27:19 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
Log Message:
Pass the VA of start (and not VM_MIN_KERNEL_ADDRESS) when mapping the
kernel at its KVA address. Previously the last 64 bytes of the .bss might
not be mapped if _end was within 64 bytes of a L2_SIZE boundary
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.35 src/sys/arch/aarch64/aarch64/locore.S:1.36
--- src/sys/arch/aarch64/aarch64/locore.S:1.35 Thu Jul 11 10:53:39 2019
+++ src/sys/arch/aarch64/aarch64/locore.S Mon Jul 15 11:27:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.35 2019/07/11 10:53:39 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.36 2019/07/15 11:27:19 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -38,7 +38,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.35 2019/07/11 10:53:39 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.36 2019/07/15 11:27:19 skrll Exp $")
/*#define DEBUG_LOCORE /* debug print */
@@ -829,7 +829,7 @@ init_mmutable:
adr x1, start /* va = start */
ADDR x2, _end
sub x2, x2, x1 /* size = _end - start */
- mov x0, #VM_MIN_KERNEL_ADDRESS /* va */
+ ldr x0, =start
bl pmapboot_enter
cbnz x0, init_mmutable_error
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Mon Jul 15 11:27:19 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: locore.S Log Message: Pass the VA of start (and not VM_MIN_KERNEL_ADDRESS) when mapping the kernel at its KVA address. Previously the last 64 bytes of the .bss might not be mapped if _end was within 64 bytes of a L2_SIZE boundary To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/aarch64/aarch64/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src Committed By: skrll Date: Mon Jul 15 08:44:33 UTC 2019 Modified Files: src/sys/arch/evbarm/fdt: fdt_machdep.c Log Message: Fix and improve a VPRINTF To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/fdt/fdt_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src
Committed By: skrll
Date: Mon Jul 15 08:44:33 UTC 2019
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Fix and improve a VPRINTF
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/fdt/fdt_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/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.62 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.63
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.62 Wed Apr 24 06:37:31 2019
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Mon Jul 15 08:44:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.62 2019/04/24 06:37:31 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.63 2019/07/15 08:44:33 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.62 2019/04/24 06:37:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.63 2019/07/15 08:44:33 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -571,9 +571,11 @@ initarm(void *arg)
const paddr_t spg = atop(spa);
const paddr_t epg = atop(epa);
+ VPRINTF(" start %08lx end %08lx... "
+ "loading in freelist %d\n", spa, epa, VM_FREELIST_DEFAULT);
+
uvm_page_physload(spg, epg, spg, epg, VM_FREELIST_DEFAULT);
- VPRINTF(" start %08lx end %08lx", ptoa(spa), ptoa(epa));
}
return sp;
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jul 15 08:27:39 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1287 - #1290 To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-8.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-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.7 src/doc/CHANGES-8.2:1.1.2.8 --- src/doc/CHANGES-8.2:1.1.2.7 Tue Jul 9 15:17:50 2019 +++ src/doc/CHANGES-8.2 Mon Jul 15 08:27:39 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.7 2019/07/09 15:17:50 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.8 2019/07/15 08:27:39 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -97,3 +97,26 @@ sys/dev/hyperv/vmbus.c1.4 Zero clear the allocated ring buffer for vmbus_channel. [nakayama, ticket #1286] +sys/netipsec/keysock.c1.69 + + Fix locking: it is fine if the lock is already key_so_mtx, this + can happen in socketpair. + [maxv, ticket #1287] + +sys/netinet6/udp6_usrreq.c 1.147 + + Fix the order in udp6_attach: soreserve should be called before + in6_pcballoc. + [maxv, ticket #1288] + +sys/dev/pci/vioscsi.c1.21 + + Fix use-after-free. + [maxv, ticket #1289] + +xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h 1.2 + + Fix sandy bridge crashes by merging changes from xorg-server 1.20 + list.h into this older version. + [mrg, ticket #1290] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jul 15 08:27:39 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1287 - #1290 To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: martin Date: Mon Jul 15 08:26:10 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src [netbsd-8]: intel_list.h Log Message: Pull up following revision(s) (requested by mrg in ticket #1290): external/mit/xf86-video-intel/dist/src/intel_list.h: revision 1.2 merge changes from xorg-server 1.20 list.h into this older version. fixes sandy bridge crashing problems for me. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \ xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h 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/xf86-video-intel/dist/src/intel_list.h diff -u xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h:1.1.1.2.2.1 --- xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h:1.1.1.2 Wed Nov 5 17:56:20 2014 +++ xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h Mon Jul 15 08:26:10 2019 @@ -305,9 +305,20 @@ list_is_empty(const struct list *head) #define list_last_entry(ptr, type, member) \ list_entry((ptr)->prev, type, member) -#define __container_of(ptr, sample, member)\ -(void *)((char *)(ptr) \ - - ((char *)&(sample)->member - (char *)(sample))) +#ifdef HAVE_TYPEOF +#define __container_of(ptr, sample, member) \ +container_of(ptr, typeof(*sample), member) +#else +/* This implementation of __container_of has undefined behavior according + * to the C standard, but it works in many cases. If your compiler doesn't + * support typeof() and fails with this implementation, please try a newer + * compiler. + */ +#define __container_of(ptr, sample, member)\ +(void *)((char *)(ptr) \ +- ((char *)&(sample)->member - (char *)(sample))) +#endif + /** * Loop through the list given by head and set pos to struct in the list. * @@ -326,12 +337,14 @@ list_is_empty(const struct list *head) * */ #define list_for_each_entry(pos, head, member)\ -for (pos = __container_of((head)->next, pos, member); \ +for (pos = NULL,\ + pos = __container_of((head)->next, pos, member); \ >member != (head); \ pos = __container_of(pos->member.next, pos, member)) #define list_for_each_entry_reverse(pos, head, member)\ -for (pos = __container_of((head)->prev, pos, member); \ +for (pos = NULL,\ + pos = __container_of((head)->prev, pos, member); \ >member != (head); \ pos = __container_of(pos->member.prev, pos, member)) @@ -343,7 +356,8 @@ list_is_empty(const struct list *head) * See list_for_each_entry for more details. */ #define list_for_each_entry_safe(pos, tmp, head, member) \ -for (pos = __container_of((head)->next, pos, member), \ +for (pos = NULL,\ + pos = __container_of((head)->next, pos, member), \ tmp = __container_of(pos->member.next, pos, member); \ >member != (head); \ pos = tmp, tmp = __container_of(pos->member.next, tmp, member))
CVS commit: [netbsd-8] xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: martin Date: Mon Jul 15 08:26:10 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src [netbsd-8]: intel_list.h Log Message: Pull up following revision(s) (requested by mrg in ticket #1290): external/mit/xf86-video-intel/dist/src/intel_list.h: revision 1.2 merge changes from xorg-server 1.20 list.h into this older version. fixes sandy bridge crashing problems for me. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \ xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jul 15 08:23:23 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: vioscsi.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1289):
sys/dev/pci/vioscsi.c: revision 1.21
Fix use-after-free. If we're not polling, virtio_enqueue_commit() will send
the transaction, and it means 'xs' can be immediately freed. So, save the
value of xs_control beforehand.
Detected by KASAN, ok jdolecek@.
Fixes PR/54008
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/dev/pci/vioscsi.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/vioscsi.c
diff -u src/sys/dev/pci/vioscsi.c:1.19 src/sys/dev/pci/vioscsi.c:1.19.2.1
--- src/sys/dev/pci/vioscsi.c:1.19 Mon May 15 21:30:37 2017
+++ src/sys/dev/pci/vioscsi.c Mon Jul 15 08:23:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vioscsi.c,v 1.19 2017/05/15 21:30:37 jdolecek Exp $ */
+/* $NetBSD: vioscsi.c,v 1.19.2.1 2019/07/15 08:23:23 martin Exp $ */
/* $OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.19 2017/05/15 21:30:37 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.19.2.1 2019/07/15 08:23:23 martin Exp $");
#include
#include
@@ -274,6 +274,7 @@ vioscsi_scsipi_request(struct scsipi_cha
struct virtio_scsi_req_hdr *req;
struct virtqueue *vq = >sc_vqs[VIOSCSI_VQ_REQUEST];
int slot, error;
+ bool dopoll;
DPRINTF(("%s: enter\n", __func__));
@@ -422,9 +423,10 @@ stuffup:
sizeof(struct virtio_scsi_res_hdr), 0);
if (xs->xs_control & XS_CTL_DATA_IN)
virtio_enqueue(vsc, vq, slot, vr->vr_data, 0);
+ dopoll = (xs->xs_control & XS_CTL_POLL) != 0;
virtio_enqueue_commit(vsc, vq, slot, 1);
- if ((xs->xs_control & XS_CTL_POLL) == 0)
+ if (!dopoll)
return;
DPRINTF(("%s: polling...\n", __func__));
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jul 15 08:23:23 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: vioscsi.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1289): sys/dev/pci/vioscsi.c: revision 1.21 Fix use-after-free. If we're not polling, virtio_enqueue_commit() will send the transaction, and it means 'xs' can be immediately freed. So, save the value of xs_control beforehand. Detected by KASAN, ok jdolecek@. Fixes PR/54008 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/dev/pci/vioscsi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/netipsec
Module Name:src
Committed By: martin
Date: Mon Jul 15 08:18:50 UTC 2019
Modified Files:
src/sys/netipsec [netbsd-8]: keysock.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1287):
sys/netipsec/keysock.c: revision 1.69
Fix locking: it is fine if the lock is already key_so_mtx, this can happen
in socketpair. In that case don't take it.
Ok ozaki-r@
To generate a diff of this commit:
cvs rdiff -u -r1.58.2.3 -r1.58.2.4 src/sys/netipsec/keysock.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/netipsec/keysock.c
diff -u src/sys/netipsec/keysock.c:1.58.2.3 src/sys/netipsec/keysock.c:1.58.2.4
--- src/sys/netipsec/keysock.c:1.58.2.3 Mon Nov 12 12:23:20 2018
+++ src/sys/netipsec/keysock.c Mon Jul 15 08:18:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.58.2.3 2018/11/12 12:23:20 martin Exp $ */
+/* $NetBSD: keysock.c,v 1.58.2.4 2019/07/15 08:18:50 martin Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.58.2.3 2018/11/12 12:23:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.58.2.4 2019/07/15 08:18:50 martin Exp $");
/* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
@@ -475,10 +475,12 @@ key_attach(struct socket *so, int proto)
s = splsoftnet();
- KASSERT(so->so_lock == NULL);
- mutex_obj_hold(key_so_mtx);
- so->so_lock = key_so_mtx;
- solock(so);
+ if (so->so_lock != key_so_mtx) {
+ KASSERT(so->so_lock == NULL);
+ mutex_obj_hold(key_so_mtx);
+ so->so_lock = key_so_mtx;
+ solock(so);
+ }
error = raw_attach(so, proto, _rawcb);
if (error) {
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Mon Jul 15 06:40:21 UTC 2019 Modified Files: src/sys/dev/usb: if_axe.c Log Message: adjust axe(4) similar to recent axen(4)/cdce(4)/ure(4) updates (which were in turn partly based upon smsc(4) changes): - mark network interface MPSAFE, and use MPSAFE calls - convert to local tick task doing watchdog timeout - add global, tx and rx locks - add ratelimited tx error message - split many functions into locked/unlocked version - use more const - fix some comments - remove spl - don't bother with OACTIVE and do it all internally (axe_tx_cnt) additional changes here: - use axe_stop() to abort pipes in detach fixes a crash potential i only saw when almost finished debugging these changes.. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/if_axe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 06:01:32 UTC 2019 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13383 Log Message: initial import of xauth-1.1 Status: Vendor Tag: xorg Release Tags: xauth-1-1 U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/configure U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/compile U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/parsedpy.c C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/xauth.c U xsrc/external/mit/xauth/dist/xauth.h N xsrc/external/mit/xauth/dist/README.md U xsrc/external/mit/xauth/dist/test-driver U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/Makefile.in U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/tests/Makefile.am U xsrc/external/mit/xauth/dist/tests/Makefile.in U xsrc/external/mit/xauth/dist/tests/test_xauth.c U xsrc/external/mit/xauth/dist/tests/setup-sourced U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 06:01:32 UTC 2019 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13383 Log Message: initial import of xauth-1.1 Status: Vendor Tag: xorg Release Tags: xauth-1-1 U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/configure U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/compile U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/parsedpy.c C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/xauth.c U xsrc/external/mit/xauth/dist/xauth.h N xsrc/external/mit/xauth/dist/README.md U xsrc/external/mit/xauth/dist/test-driver U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/Makefile.in U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/tests/Makefile.am U xsrc/external/mit/xauth/dist/tests/Makefile.in U xsrc/external/mit/xauth/dist/tests/test_xauth.c U xsrc/external/mit/xauth/dist/tests/setup-sourced U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS commit: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 06:01:53 UTC 2019 Modified Files: xsrc/external/mit/xauth/dist: process.c Removed Files: xsrc/external/mit/xauth/dist: README Log Message: merge xauth 1.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/xauth/dist/README cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xauth/dist/process.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
