Module Name: src
Committed By: christos
Date: Tue Apr 28 00:19:23 UTC 2020
Modified Files:
src/lib/libkvm: kvm.c
Log Message:
make kvm_pread use the mapped buffer if it is available.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/lib/libkvm/kvm.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/libkvm/kvm.c
diff -u src/lib/libkvm/kvm.c:1.106 src/lib/libkvm/kvm.c:1.107
--- src/lib/libkvm/kvm.c:1.106 Mon Apr 27 20:12:01 2020
+++ src/lib/libkvm/kvm.c Mon Apr 27 20:19:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm.c,v 1.106 2020/04/28 00:12:01 christos Exp $ */
+/* $NetBSD: kvm.c,v 1.107 2020/04/28 00:19:23 christos Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94";
#else
-__RCSID("$NetBSD: kvm.c,v 1.106 2020/04/28 00:12:01 christos Exp $");
+__RCSID("$NetBSD: kvm.c,v 1.107 2020/04/28 00:19:23 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -177,6 +177,15 @@ _kvm_pread(kvm_t *kd, int fd, void *buf,
ssize_t rv;
off_t doff;
+ if (kd->dump_mem != MAP_FAILED) {
+ if (size + off > kd->dump_size) {
+ errno = EINVAL;
+ return -1;
+ }
+ memcpy(buf, (char *)kd->dump_mem + off, size);
+ return size;
+ }
+
/* If aligned nothing to do. */
if (((off % kd->fdalign) | (size % kd->fdalign)) == 0) {
return pread(fd, buf, size, off);
