Module Name: src
Committed By: sborrill
Date: Fri Nov 18 22:47:35 UTC 2011
Modified Files:
src/sys/uvm [netbsd-5-0]: uvm_meter.c
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1691):
sys/uvm/uvm_meter.c: revision 1.57
Dereference correct variable and thus stop a sysctl crash.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.14.1 src/sys/uvm/uvm_meter.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/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.49 src/sys/uvm/uvm_meter.c:1.49.14.1
--- src/sys/uvm/uvm_meter.c:1.49 Wed Jun 4 12:45:28 2008
+++ src/sys/uvm/uvm_meter.c Fri Nov 18 22:47:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.49 2008/06/04 12:45:28 ad Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.49.14.1 2011/11/18 22:47:35 sborrill Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.49 2008/06/04 12:45:28 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.49.14.1 2011/11/18 22:47:35 sborrill Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -152,7 +152,7 @@ sysctl_vm_uvmexp(SYSCTLFN_ARGS)
struct sysctlnode node;
node = *rnode;
- if (oldp)
+ if (oldlenp)
node.sysctl_size = min(*oldlenp, node.sysctl_size);
return (sysctl_lookup(SYSCTLFN_CALL(&node)));
