CVS commit: src/sys/kern
Module Name:src
Committed By: isaki
Date: Sat Apr 29 03:36:55 UTC 2023
Modified Files:
src/sys/kern: subr_time.c
Log Message:
White space fix.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/kern/subr_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_time.c
diff -u src/sys/kern/subr_time.c:1.36 src/sys/kern/subr_time.c:1.37
--- src/sys/kern/subr_time.c:1.36 Sun Apr 9 09:18:09 2023
+++ src/sys/kern/subr_time.c Sat Apr 29 03:36:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.36 2023/04/09 09:18:09 riastradh Exp $ */
+/* $NetBSD: subr_time.c,v 1.37 2023/04/29 03:36:55 isaki Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.36 2023/04/09 09:18:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.37 2023/04/29 03:36:55 isaki Exp $");
#include
#include
@@ -255,10 +255,10 @@ ticks2ts(uint64_t ticks, struct timespec
uint64_t sticks = ticks - ts->tv_sec * hz;
if (sticks > BINTIME_SCALE_MS) /* floor(2^64 / 1000) */
ts->tv_nsec = sticks / hz * 10LL;
- else if (sticks > BINTIME_SCALE_US) /* floor(2^64 / 100) */
- ts->tv_nsec = sticks * 1000LL / hz * 100LL;
+ else if (sticks > BINTIME_SCALE_US) /* floor(2^64 / 100) */
+ ts->tv_nsec = sticks * 1000LL / hz * 100LL;
else
- ts->tv_nsec = sticks * 10LL / hz;
+ ts->tv_nsec = sticks * 10LL / hz;
DPRINTF(("%s: %ju/%ju -> %ju.%ju\n", __func__,
(uintmax_t)ticks, (uintmax_t)sticks,
(uintmax_t)ts->tv_sec, (uintmax_t)ts->tv_nsec));
@@ -307,7 +307,7 @@ clock_gettime1(clockid_t clock_id, struc
DPRINTF(("%s: r=%ju, s=%ju\n", __func__,
(uintmax_t)l->l_rticksum, (uintmax_t)l->l_slpticksum));
mutex_exit(p->p_lock);
-} else
+ } else
ticks = (uint64_t)-1;
if (ticks != (uint64_t)-1) {
CVS commit: src/sys/kern
Module Name:src Committed By: isaki Date: Sat Apr 29 03:36:55 UTC 2023 Modified Files: src/sys/kern: subr_time.c Log Message: White space fix. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/kern/subr_time.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/m68k/m68k
Module Name:src Committed By: isaki Date: Sat Apr 29 03:17:30 UTC 2023 Modified Files: src/sys/arch/m68k/m68k: busaddrerr.s Log Message: m68k: Support TT(Transparent Translation) for 020/030 buserror handler. This avoids a panic when trying badaddr() against to an address where bus error occurs in the TT region. Only luna68k and news68k use TT. Discussed on port-m68k. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/m68k/busaddrerr.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/m68k/m68k/busaddrerr.s diff -u src/sys/arch/m68k/m68k/busaddrerr.s:1.1 src/sys/arch/m68k/m68k/busaddrerr.s:1.2 --- src/sys/arch/m68k/m68k/busaddrerr.s:1.1 Sat Mar 15 09:22:36 2014 +++ src/sys/arch/m68k/m68k/busaddrerr.s Sat Apr 29 03:17:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: busaddrerr.s,v 1.1 2014/03/15 09:22:36 tsutsui Exp $ */ +/* $NetBSD: busaddrerr.s,v 1.2 2023/04/29 03:17:30 isaki Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -219,7 +219,12 @@ Lbe10: jeq Lbe10a | if no, done movql #5,%d0 | else supervisor program access Lbe10a: - ptestr %d0,%a0@,#7 | do a table search + ptestr %d0,%a0@,#0 | only PTEST #0 can detect transparent + pmove %psr,%sp@ | translation (TT0 or TT1). + movw %sp@,%d1 + btst #6,%d1 | transparent (TT0 or TT1)? + jne Lisberr1 | yes -> bus error + ptestr %d0,%a0@,#7 | no, do a table search pmove %psr,%sp@ | save result movb %sp@,%d1 btst #2,%d1 | invalid (incl. limit viol. and berr)?
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: isaki Date: Sat Apr 29 03:17:30 UTC 2023 Modified Files: src/sys/arch/m68k/m68k: busaddrerr.s Log Message: m68k: Support TT(Transparent Translation) for 020/030 buserror handler. This avoids a panic when trying badaddr() against to an address where bus error occurs in the TT region. Only luna68k and news68k use TT. Discussed on port-m68k. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/m68k/busaddrerr.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: andvar
Date: Fri Apr 28 22:31:38 UTC 2023
Modified Files:
src/sys/arch/sh3/include: mmu_sh4.h
src/sys/fs/nfs/nlm: nlm_prot_impl.c
Log Message:
fix few typos and grammar in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sh3/include/mmu_sh4.h
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/nfs/nlm/nlm_prot_impl.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/sh3/include/mmu_sh4.h
diff -u src/sys/arch/sh3/include/mmu_sh4.h:1.7 src/sys/arch/sh3/include/mmu_sh4.h:1.8
--- src/sys/arch/sh3/include/mmu_sh4.h:1.7 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sh3/include/mmu_sh4.h Fri Apr 28 22:31:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mmu_sh4.h,v 1.7 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: mmu_sh4.h,v 1.8 2023/04/28 22:31:38 andvar Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -73,9 +73,9 @@
SH4_MMUCR_URC_MASK | SH4_MMUCR_SQMD | SH4_MMUCR_SV | SH4_MMUCR_AT)
/*
* memory-mapped TLB
- * must be access from P2-area program.
- * branch to the other area must be maed at least 8 instruction
- * after access.
+ * must be accessed from P2-area program.
+ * branch to the other area must be made at least 8 instructions
+ * after the access.
*/
#define SH4_ITLB_ENTRY 4
#define SH4_UTLB_ENTRY 64
Index: src/sys/fs/nfs/nlm/nlm_prot_impl.c
diff -u src/sys/fs/nfs/nlm/nlm_prot_impl.c:1.4 src/sys/fs/nfs/nlm/nlm_prot_impl.c:1.5
--- src/sys/fs/nfs/nlm/nlm_prot_impl.c:1.4 Tue Dec 13 21:58:17 2016
+++ src/sys/fs/nfs/nlm/nlm_prot_impl.c Fri Apr 28 22:31:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nlm_prot_impl.c,v 1.4 2016/12/13 21:58:17 pgoyette Exp $ */
+/* $NetBSD: nlm_prot_impl.c,v 1.5 2023/04/28 22:31:38 andvar Exp $ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson
@@ -32,7 +32,7 @@
#include
/* __FBSDID("FreeBSD: head/sys/nlm/nlm_prot_impl.c 302216 2016-06-26 20:08:42Z kib "); */
-__RCSID("$NetBSD: nlm_prot_impl.c,v 1.4 2016/12/13 21:58:17 pgoyette Exp $");
+__RCSID("$NetBSD: nlm_prot_impl.c,v 1.5 2023/04/28 22:31:38 andvar Exp $");
#include
#include
@@ -247,7 +247,7 @@ struct nlm_host {
volatile u_int nh_refs; /* (a) reference count */
TAILQ_ENTRY(nlm_host) nh_link; /* (g) global list of hosts */
char nh_caller_name[MAXNAMELEN]; /* (c) printable name of host */
- uint32_t nh_sysid; /* (c) our allocaed system ID */
+ uint32_t nh_sysid; /* (c) our allocated system ID */
char nh_sysid_string[10]; /* (c) string rep. of sysid */
struct sockaddr_storage nh_addr; /* (s) remote address of host */
struct nlm_rpc nh_srvrpc; /* (l) RPC for server replies */
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri Apr 28 22:31:38 UTC 2023 Modified Files: src/sys/arch/sh3/include: mmu_sh4.h src/sys/fs/nfs/nlm: nlm_prot_impl.c Log Message: fix few typos and grammar in comments. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sh3/include/mmu_sh4.h cvs rdiff -u -r1.4 -r1.5 src/sys/fs/nfs/nlm/nlm_prot_impl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/chflags
Module Name:src Committed By: andvar Date: Fri Apr 28 22:23:45 UTC 2023 Modified Files: src/usr.bin/chflags: chflags.c Log Message: one more place for recently fixed typo, s/phisycal/physical/. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/chflags/chflags.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/chflags
Module Name:src
Committed By: andvar
Date: Fri Apr 28 22:23:45 UTC 2023
Modified Files:
src/usr.bin/chflags: chflags.c
Log Message:
one more place for recently fixed typo, s/phisycal/physical/.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/chflags/chflags.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/chflags/chflags.c
diff -u src/usr.bin/chflags/chflags.c:1.16 src/usr.bin/chflags/chflags.c:1.17
--- src/usr.bin/chflags/chflags.c:1.16 Mon Aug 29 14:05:08 2011
+++ src/usr.bin/chflags/chflags.c Fri Apr 28 22:23:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: chflags.c,v 1.16 2011/08/29 14:05:08 joerg Exp $ */
+/* $NetBSD: chflags.c,v 1.17 2023/04/28 22:23:45 andvar Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 19
#if 0
static char sccsid[] = "from: @(#)chflags.c 8.5 (Berkeley) 4/1/94";
#else
-__RCSID("$NetBSD: chflags.c,v 1.16 2011/08/29 14:05:08 joerg Exp $");
+__RCSID("$NetBSD: chflags.c,v 1.17 2023/04/28 22:23:45 andvar Exp $");
#endif
#endif /* not lint */
@@ -167,7 +167,7 @@ main(int argc, char *argv[])
/*
* The only symlinks that end up here are ones that
* don't point to anything. Note that if we are
- * doing a phisycal walk, we never reach here unless
+ * doing a physical walk, we never reach here unless
* we asked to follow explicitly.
*/
continue;
CVS commit: src/doc
Module Name:src Committed By: gutteridge Date: Fri Apr 28 16:13:12 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: 3RDPARTY: the atf-devel mailing list was closed years ago To generate a diff of this commit: cvs rdiff -u -r1.1923 -r1.1924 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: gutteridge Date: Fri Apr 28 16:13:12 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: 3RDPARTY: the atf-devel mailing list was closed years ago To generate a diff of this commit: cvs rdiff -u -r1.1923 -r1.1924 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1923 src/doc/3RDPARTY:1.1924 --- src/doc/3RDPARTY:1.1923 Wed Apr 26 18:42:41 2023 +++ src/doc/3RDPARTY Fri Apr 28 16:13:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1923 2023/04/26 18:42:41 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1924 2023/04/28 16:13:11 gutteridge Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -78,8 +78,8 @@ Current Vers: 0.21 Maintainer: Julio Merino Archive site: https://github.com/jmmv/atf/releases Home page: https://github.com/jmmv/atf -Date: 2020-06-13 -Mailing List: atf-de...@netbsd.org +Date: 2023-04-27 +Mailing List: atf-disc...@googlegroups.com Responsible: jmmv License: The NetBSD Foundation's license (BSD 2-clause) Location: external/bsd/atf/dist
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Fri Apr 28 13:09:48 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: parse.mk var-scope-local.exp var-scope-local.mk Log Message: tests/make: add tests for target-local variables While here, move a test from var-scope-local.mk to parse.mk since that test is not related to variables. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/parse.mk cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/var-scope-local.exp cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/var-scope-local.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Fri Apr 28 13:09:48 UTC 2023
Modified Files:
src/usr.bin/make/unit-tests: parse.mk var-scope-local.exp
var-scope-local.mk
Log Message:
tests/make: add tests for target-local variables
While here, move a test from var-scope-local.mk to parse.mk since that
test is not related to variables.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/parse.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/var-scope-local.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/var-scope-local.mk
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/make/unit-tests/parse.mk
diff -u src/usr.bin/make/unit-tests/parse.mk:1.3 src/usr.bin/make/unit-tests/parse.mk:1.4
--- src/usr.bin/make/unit-tests/parse.mk:1.3 Sun Jul 24 20:25:23 2022
+++ src/usr.bin/make/unit-tests/parse.mk Fri Apr 28 13:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: parse.mk,v 1.3 2022/07/24 20:25:23 rillig Exp $
+# $NetBSD: parse.mk,v 1.4 2023/04/28 13:09:48 rillig Exp $
#
# Test those parts of the parsing that do not belong in any of the other
# categories.
@@ -22,3 +22,33 @@
#
# https://bugs.freebsd.org/265119
one-target ${:U }
+
+
+# Since parse.c 1.656 from 2022-01-27 and before parse.c 1.662 from
+# 2022-02-05, there was an out-of-bounds read in Parse_IsVar when looking for
+# a variable assignment in a dependency line with trailing whitespace. Lines
+# without trailing whitespace were not affected. Global variable assignments
+# were guaranteed to have no trailing whitespace and were thus not affected.
+#
+# Try to reproduce some variants that may lead to a crash, depending on the
+# memory allocator. To get a crash, the terminating '\0' of the line must be
+# the last byte of a memory page. The expression '${:U}' forces this trailing
+# whitespace.
+
+# On FreeBSD x86_64, a crash could in some cases be forced using the following
+# line, which has length 47, and if the memory for the expanded line starts at
+# 0x_XXd0, the terminating '\0' may end up at 0x_Xfff:
+Try_to_crash_FreeBSD.xx: 12345 ${:U}
+
+# The following line has length 4095 after being expanded, so line[4095] ==
+# '\0'. If the line is
+# allocated on a page boundary and the following page is not mapped, this line
+# leads to a segmentation fault.
+${:U:range=511:@_@1234567@:ts.}: 12345 ${:U}
+
+# The following line has length 8191, so line[8191] == '\0'. If the line is
+# allocated on a page boundary and the following page is not mapped, this line
+# leads to a segmentation fault.
+${:U:range=1023:@_@1234567@:ts.}: 12345 ${:U}
+
+12345:
Index: src/usr.bin/make/unit-tests/var-scope-local.exp
diff -u src/usr.bin/make/unit-tests/var-scope-local.exp:1.4 src/usr.bin/make/unit-tests/var-scope-local.exp:1.5
--- src/usr.bin/make/unit-tests/var-scope-local.exp:1.4 Sat Mar 26 14:34:07 2022
+++ src/usr.bin/make/unit-tests/var-scope-local.exp Fri Apr 28 13:09:48 2023
@@ -1,5 +1,5 @@
-Global: .ALLTARGETS = one
-Global: .ALLTARGETS = one two
+Global: .ALLTARGETS = all target-rule.ext dir/subdir/target-rule.ext inference-rule.ir-to dir/subdir/inference-rule.ir-to inference-rule.ir-from dir/subdir/inference-rule.ir-from inference-rule-chain.ir-to dir/subdir/inference-rule-chain.ir-to inference-rule-chain.ir-gen-from dir/subdir/inference-rule-chain.ir-gen-from one
+Global: .ALLTARGETS = all target-rule.ext dir/subdir/target-rule.ext inference-rule.ir-to dir/subdir/inference-rule.ir-to inference-rule.ir-from dir/subdir/inference-rule.ir-from inference-rule-chain.ir-to dir/subdir/inference-rule-chain.ir-to inference-rule-chain.ir-gen-from dir/subdir/inference-rule-chain.ir-gen-from one two
Var_Parse: ${.MAKE.TARGET_LOCAL_VARIABLES} (eval)
Var_SetExpand: variable name "" expands to empty string, with value "three" - ignored
Var_SetExpand: variable name "" expands to empty string, with value "three" - ignored
@@ -7,6 +7,46 @@ Global: one two = # (empty)
Global: one two = three
Global: .MAKEFLAGS = -r -k -d v -d
Global: .MAKEFLAGS = -r -k -d v -d 0
+target-rule.ext: @ =
+target-rule.ext: % =
+target-rule.ext: ? = <>
+target-rule.ext: < =
+target-rule.ext: * =
+dir/subdir/target-rule.ext: @ =
+dir/subdir/target-rule.ext: % =
+dir/subdir/target-rule.ext: ? = <>
+dir/subdir/target-rule.ext: < =
+dir/subdir/target-rule.ext: * =
+inference-rule.ir-to: @ =
+inference-rule.ir-to: % =
+inference-rule.ir-to: ? =
+inference-rule.ir-to: < =
+inference-rule.ir-to: * =
+dir/subdir/inference-rule.ir-to: @ =
+dir/subdir/inference-rule.ir-to: % =
+dir/subdir/inference-rule.ir-to: ? =
+dir/subdir/inference-rule.ir-to: < =
+dir/subdir/inference-rule.ir-to: * =
+inference-rule-chain.ir-from: @ =
+inference-rule-chain.ir-from: % =
+inference-rule-chain.ir-from: ? =
+inference-rule-chain.ir-from: < =
+inference-rule-chain.ir-from: * =
CVS commit: src/sbin/chown
Module Name:src
Committed By: pgoyette
Date: Fri Apr 28 09:56:45 UTC 2023
Modified Files:
src/sbin/chown: chown.c
Log Message:
Fix typo in comment
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/chown/chown.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/chown/chown.c
diff -u src/sbin/chown/chown.c:1.8 src/sbin/chown/chown.c:1.9
--- src/sbin/chown/chown.c:1.8 Wed Oct 24 01:12:51 2012
+++ src/sbin/chown/chown.c Fri Apr 28 09:56:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: chown.c,v 1.8 2012/10/24 01:12:51 enami Exp $ */
+/* $NetBSD: chown.c,v 1.9 2023/04/28 09:56:45 pgoyette Exp $ */
/*
* Copyright (c) 1988, 1993, 1994, 2003
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)chown.c 8.8 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: chown.c,v 1.8 2012/10/24 01:12:51 enami Exp $");
+__RCSID("$NetBSD: chown.c,v 1.9 2023/04/28 09:56:45 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -224,7 +224,7 @@ main(int argc, char **argv)
/*
* The only symlinks that end up here are ones that
* don't point to anything. Note that if we are
- * doing a phisycal walk, we never reach here unless
+ * doing a physical walk, we never reach here unless
* we asked to follow explicitly.
*/
continue;
CVS commit: src/sbin/chown
Module Name:src Committed By: pgoyette Date: Fri Apr 28 09:56:45 UTC 2023 Modified Files: src/sbin/chown: chown.c Log Message: Fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sbin/chown/chown.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Fri Apr 28 07:33:57 UTC 2023
Modified Files:
src/sys/arch/aarch64/aarch64: kobj_machdep.c
src/sys/arch/alpha/alpha: kobj_machdep.c
src/sys/arch/amd64/amd64: kobj_machdep.c
src/sys/arch/arm/arm32: kobj_machdep.c
src/sys/arch/hppa/hppa: kobj_machdep.c
src/sys/arch/i386/i386: kobj_machdep.c
src/sys/arch/m68k/m68k: kobj_machdep.c
src/sys/arch/mips/mips: kobj_machdep.c
src/sys/arch/powerpc/powerpc: kobj_machdep.c
src/sys/arch/sh3/sh3: kobj_machdep.c
src/sys/arch/sparc/sparc: kobj_machdep.c
src/sys/arch/sparc64/sparc64: kobj_machdep.c
src/sys/arch/vax/vax: kobj_machdep.c
src/sys/kern: subr_kobj.c
src/sys/sys: kobj.h
Log Message:
Pass local symbols relocations in both passes and provide the kobj_reloc
implementation visibility of these relocations.
Currently all implementations resolve local symbol relocations in the first
pass and simply skip them in the second. The RISC-V implementation will
make use of this visiblity.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/kobj_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/alpha/kobj_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/amd64/kobj_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/arm32/kobj_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/hppa/kobj_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/i386/kobj_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/m68k/kobj_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/mips/kobj_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/powerpc/kobj_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sh3/sh3/kobj_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/sparc/kobj_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/sparc64/kobj_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/vax/kobj_machdep.c
cvs rdiff -u -r1.77 -r1.78 src/sys/kern/subr_kobj.c
cvs rdiff -u -r1.20 -r1.21 src/sys/sys/kobj.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/arch/aarch64/aarch64/kobj_machdep.c
diff -u src/sys/arch/aarch64/aarch64/kobj_machdep.c:1.6 src/sys/arch/aarch64/aarch64/kobj_machdep.c:1.7
--- src/sys/arch/aarch64/aarch64/kobj_machdep.c:1.6 Fri Dec 11 18:03:33 2020
+++ src/sys/arch/aarch64/aarch64/kobj_machdep.c Fri Apr 28 07:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.6 2020/12/11 18:03:33 skrll Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.7 2023/04/28 07:33:55 skrll Exp $ */
/*
* Copyright (c) 2018 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.6 2020/12/11 18:03:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.7 2023/04/28 07:33:55 skrll Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -168,6 +168,12 @@ kobj_reloc(kobj_t ko, uintptr_t relocbas
return 0;
}
+ const Elf_Sym *sym = kobj_symbol(ko, symidx);
+
+ if (!local && ELF_ST_BIND(sym->st_info) == STB_LOCAL) {
+ return 0;
+ }
+
error = kobj_sym_lookup(ko, symidx, );
if (error != 0) {
printf("kobj_reloc: symidx %d lookup failure."
Index: src/sys/arch/alpha/alpha/kobj_machdep.c
diff -u src/sys/arch/alpha/alpha/kobj_machdep.c:1.3 src/sys/arch/alpha/alpha/kobj_machdep.c:1.4
--- src/sys/arch/alpha/alpha/kobj_machdep.c:1.3 Fri Nov 3 09:59:07 2017
+++ src/sys/arch/alpha/alpha/kobj_machdep.c Fri Apr 28 07:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.3 2017/11/03 09:59:07 maxv Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.4 2023/04/28 07:33:55 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.3 2017/11/03 09:59:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.4 2023/04/28 07:33:55 skrll Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -88,6 +88,12 @@ kobj_reloc(kobj_t ko, uintptr_t relocbas
symidx = ELF_R_SYM(rel->r_info);
}
+ const Elf_Sym *sym = kobj_symbol(ko, symidx);
+
+ if (!local && ELF_ST_BIND(sym->st_info) == STB_LOCAL) {
+ return 0;
+ }
+
switch (rtype) {
case R_ALPHA_NONE:
break;
Index: src/sys/arch/amd64/amd64/kobj_machdep.c
diff -u src/sys/arch/amd64/amd64/kobj_machdep.c:1.8 src/sys/arch/amd64/amd64/kobj_machdep.c:1.9
--- src/sys/arch/amd64/amd64/kobj_machdep.c:1.8 Tue May 28 03:52:08 2019
+++ src/sys/arch/amd64/amd64/kobj_machdep.c Fri Apr 28 07:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.8 2019/05/28 03:52:08 kamil Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.9 2023/04/28 07:33:55 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.8 2019/05/28 03:52:08 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.9 2023/04/28 07:33:55 skrll Exp $");
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Fri Apr 28 07:33:57 UTC 2023 Modified Files: src/sys/arch/aarch64/aarch64: kobj_machdep.c src/sys/arch/alpha/alpha: kobj_machdep.c src/sys/arch/amd64/amd64: kobj_machdep.c src/sys/arch/arm/arm32: kobj_machdep.c src/sys/arch/hppa/hppa: kobj_machdep.c src/sys/arch/i386/i386: kobj_machdep.c src/sys/arch/m68k/m68k: kobj_machdep.c src/sys/arch/mips/mips: kobj_machdep.c src/sys/arch/powerpc/powerpc: kobj_machdep.c src/sys/arch/sh3/sh3: kobj_machdep.c src/sys/arch/sparc/sparc: kobj_machdep.c src/sys/arch/sparc64/sparc64: kobj_machdep.c src/sys/arch/vax/vax: kobj_machdep.c src/sys/kern: subr_kobj.c src/sys/sys: kobj.h Log Message: Pass local symbols relocations in both passes and provide the kobj_reloc implementation visibility of these relocations. Currently all implementations resolve local symbol relocations in the first pass and simply skip them in the second. The RISC-V implementation will make use of this visiblity. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/kobj_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/alpha/kobj_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/amd64/kobj_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/arm32/kobj_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/hppa/kobj_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/i386/kobj_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/m68k/kobj_machdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/mips/kobj_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/powerpc/kobj_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sh3/sh3/kobj_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/sparc/kobj_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/sparc64/kobj_machdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/vax/kobj_machdep.c cvs rdiff -u -r1.77 -r1.78 src/sys/kern/subr_kobj.c cvs rdiff -u -r1.20 -r1.21 src/sys/sys/kobj.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libcurses
Module Name:src
Committed By: blymn
Date: Fri Apr 28 07:12:39 UTC 2023
Modified Files:
src/lib/libcurses: refresh.c
Log Message:
Don't set the clear_to_eol variable in doupdate to NULL, this was a
leftover from previous code that makes no sense and makes worms(6)
crash randomly. Thanks to kre@ for reporting this.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/lib/libcurses/refresh.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/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.126 src/lib/libcurses/refresh.c:1.127
--- src/lib/libcurses/refresh.c:1.126 Mon Dec 5 21:14:25 2022
+++ src/lib/libcurses/refresh.c Fri Apr 28 07:12:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.126 2022/12/05 21:14:25 blymn Exp $ */
+/* $NetBSD: refresh.c,v 1.127 2023/04/28 07:12:39 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94";
#else
-__RCSID("$NetBSD: refresh.c,v 1.126 2022/12/05 21:14:25 blymn Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.127 2023/04/28 07:12:39 blymn Exp $");
#endif
#endif/* not lint */
@@ -1382,7 +1382,6 @@ makech(int wy)
}
return OK;
}
-ce = NULL;
}
#ifdef HAVE_WCHAR
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Fri Apr 28 07:12:39 UTC 2023 Modified Files: src/lib/libcurses: refresh.c Log Message: Don't set the clear_to_eol variable in doupdate to NULL, this was a leftover from previous code that makes no sense and makes worms(6) crash randomly. Thanks to kre@ for reporting this. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/lib/libcurses/refresh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
