Module Name: src
Committed By: riastradh
Date: Wed Jun 2 08:46:17 UTC 2021
Modified Files:
src/sys/kern: kern_ksyms.c
Log Message:
Revert "ksyms(4): Don't skip symbol tables that are soon to be freed."
Apparently the equality kassert this restored doesn't work; to be
analyzed.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/kern/kern_ksyms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.92 src/sys/kern/kern_ksyms.c:1.93
--- src/sys/kern/kern_ksyms.c:1.92 Tue Jun 1 21:11:52 2021
+++ src/sys/kern/kern_ksyms.c Wed Jun 2 08:46:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ksyms.c,v 1.92 2021/06/01 21:11:52 riastradh Exp $ */
+/* $NetBSD: kern_ksyms.c,v 1.93 2021/06/02 08:46:16 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.92 2021/06/01 21:11:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.93 2021/06/02 08:46:16 riastradh Exp $");
#if defined(_KERNEL) && defined(_KERNEL_OPT)
#include "opt_copy_symtab.h"
@@ -1089,6 +1089,8 @@ ksymsread(dev_t dev, struct uio *uio, in
for (st = TAILQ_FIRST(&ksyms_symtabs);
st != ksyms_last_snapshot;
st = TAILQ_NEXT(st, sd_queue)) {
+ if (__predict_false(st->sd_gone))
+ continue;
if (uio->uio_resid == 0)
return 0;
if (uio->uio_offset <= st->sd_symsize + filepos) {
@@ -1104,11 +1106,13 @@ ksymsread(dev_t dev, struct uio *uio, in
/*
* Copy out the string table
*/
- KASSERT(filepos == sizeof(struct ksyms_hdr) +
+ KASSERT(filepos <= sizeof(struct ksyms_hdr) +
ksyms_hdr.kh_shdr[SYMTAB].sh_size);
for (st = TAILQ_FIRST(&ksyms_symtabs);
st != ksyms_last_snapshot;
st = TAILQ_NEXT(st, sd_queue)) {
+ if (__predict_false(st->sd_gone))
+ continue;
if (uio->uio_resid == 0)
return 0;
if (uio->uio_offset <= st->sd_strsize + filepos) {
