Module Name: src
Committed By: christos
Date: Mon Dec 21 19:54:35 UTC 2015
Modified Files:
src/sys/arch/usermode/usermode: thunk.c
Log Message:
more checking
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/usermode/usermode/thunk.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/usermode/usermode/thunk.c
diff -u src/sys/arch/usermode/usermode/thunk.c:1.85 src/sys/arch/usermode/usermode/thunk.c:1.86
--- src/sys/arch/usermode/usermode/thunk.c:1.85 Fri Feb 6 05:25:13 2015
+++ src/sys/arch/usermode/usermode/thunk.c Mon Dec 21 14:54:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.c,v 1.85 2015/02/06 10:25:13 prlw1 Exp $ */
+/* $NetBSD: thunk.c,v 1.86 2015/12/21 19:54:35 christos Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.85 2015/02/06 10:25:13 prlw1 Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.86 2015/12/21 19:54:35 christos Exp $");
#endif
#include <sys/types.h>
@@ -761,15 +761,19 @@ thunk_getcpuinfo(char *cp, size_t *len)
fd = open("/proc/cpuinfo", O_RDONLY);
if (fd == -1)
- return -1;
- rlen = read(fd, cp, *len - 1);
+ goto out;
+ rlen = read(fd, cp, *len);
close(fd);
if (rlen == -1)
- return -1;
+ goto out;
+ buf[rlen ? rlen - 1 : 0] = '\0';
*len = rlen;
return 0;
+bad:
+ *len = 0;
+ return -1;
}
int
