Module Name: src
Committed By: stacktic
Date: Sat Oct 23 14:34:12 UTC 2010
Modified Files:
src/lib/libkvm: kvm.c
Log Message:
Do not return -1 on _kvm_read when all the requested data could be read (fix
bin/38648)
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 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.95 src/lib/libkvm/kvm.c:1.96
--- src/lib/libkvm/kvm.c:1.95 Mon Sep 20 23:23:16 2010
+++ src/lib/libkvm/kvm.c Sat Oct 23 14:34:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm.c,v 1.95 2010/09/20 23:23:16 jym Exp $ */
+/* $NetBSD: kvm.c,v 1.96 2010/10/23 14:34:12 stacktic 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.95 2010/09/20 23:23:16 jym Exp $");
+__RCSID("$NetBSD: kvm.c,v 1.96 2010/10/23 14:34:12 stacktic Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -216,7 +216,7 @@
kd->iobufsz = dsize;
}
rv = pread(fd, kd->iobuf, dsize, doff);
- if (rv < dsize)
+ if (rv < size + moff)
return -1;
memcpy(buf, kd->iobuf + moff, size);
return size;
