Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The entropy collection sysctl returns the number of record and not the 

copied data size.
This commit is contained in:
manu 2004-07-27 20:41:48 +00:00
parent 0a61854f64
commit 09ee1c0349
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/compat/darwin/darwin_sysctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: darwin_sysctl.c,v 1.29 2004/07/25 07:54:54 manu Exp $ */
/* $NetBSD: darwin_sysctl.c,v 1.30 2004/07/27 20:41:48 manu Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: darwin_sysctl.c,v 1.29 2004/07/25 07:54:54 manu Exp $");
__KERNEL_RCSID(0, "$NetBSD: darwin_sysctl.c,v 1.30 2004/07/27 20:41:48 manu Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -490,11 +490,11 @@ darwin_sysctl_kdebug(SYSCTLFN_ARGS)
else
mstimeout = name[1];
if (*oldlenp > DARWIN_ENTROPYMAX)
/* Try to mimmic Darwin a bit better */
count = 9 * mstimeout / 10;
if (count > DARWIN_ENTROPYMAX)
return ENOMEM;
count = *oldlenp;
buf = malloc(sizeof(*buf) * count, M_TEMP, M_ZERO|M_WAITOK);
microtime(&now);
@ -525,8 +525,19 @@ darwin_sysctl_kdebug(SYSCTLFN_ARGS)
tsleep(&timeout, PZERO|PCATCH, "darwin_entropy",
(mstimeout * hz / 1000));
error = copyout(buf, oldp, sizeof(*buf) * count);
/* Just in case... */
if (sizeof(*buf) * count < *oldlenp)
*oldlenp = sizeof(*buf) * count;
error = copyout(buf, oldp, *oldlenp);
free(buf, M_TEMP);
/*
* The return value is the number of record
* instead of the size of the copied data.
*/
*oldlenp = *oldlenp / sizeof(*buf);
return error;
break;