Module Name: src
Committed By: mlelstv
Date: Sun Jul 18 06:57:28 UTC 2021
Modified Files:
src/sys/kern: kern_ksyms.c
Log Message:
skip symbol tables that were unloaded again to avoid EFAULT when reading
ksyms.
also restore TAILQ_FOREACH idiom.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 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.97 src/sys/kern/kern_ksyms.c:1.98
--- src/sys/kern/kern_ksyms.c:1.97 Thu Jun 3 09:22:47 2021
+++ src/sys/kern/kern_ksyms.c Sun Jul 18 06:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ksyms.c,v 1.97 2021/06/03 09:22:47 riastradh Exp $ */
+/* $NetBSD: kern_ksyms.c,v 1.98 2021/07/18 06:57:28 mlelstv 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.97 2021/06/03 09:22:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.98 2021/07/18 06:57:28 mlelstv Exp $");
#if defined(_KERNEL) && defined(_KERNEL_OPT)
#include "opt_copy_symtab.h"
@@ -1084,9 +1084,9 @@ ksymsread(dev_t dev, struct uio *uio, in
* Copy out the symbol table.
*/
filepos = sizeof(struct ksyms_hdr);
- for (st = TAILQ_FIRST(&ksyms_symtabs);
- ;
- st = TAILQ_NEXT(st, sd_queue)) {
+ TAILQ_FOREACH(st, &ksyms_symtabs, sd_queue) {
+ if (__predict_false(st->sd_gone))
+ continue;
if (uio->uio_resid == 0)
return 0;
if (uio->uio_offset <= st->sd_symsize + filepos) {
