Module Name: src
Committed By: dholland
Date: Tue Feb 16 05:47:52 UTC 2010
Modified Files:
src/sys/kern: kern_module_vfs.c
Log Message:
Don't inspect vn_stat() results until after checking that it succeeded.
If anyone's been seeing random "File too large" results from module loading,
this should fix it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/kern_module_vfs.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/kern/kern_module_vfs.c
diff -u src/sys/kern/kern_module_vfs.c:1.2 src/sys/kern/kern_module_vfs.c:1.3
--- src/sys/kern/kern_module_vfs.c:1.2 Tue Jan 19 22:17:44 2010
+++ src/sys/kern/kern_module_vfs.c Tue Feb 16 05:47:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module_vfs.c,v 1.2 2010/01/19 22:17:44 pooka Exp $ */
+/* $NetBSD: kern_module_vfs.c,v 1.3 2010/02/16 05:47:52 dholland Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module_vfs.c,v 1.2 2010/01/19 22:17:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module_vfs.c,v 1.3 2010/02/16 05:47:52 dholland Exp $");
#define _MODULE_INTERNAL
#include <sys/param.h>
@@ -153,10 +153,11 @@
}
error = vn_stat(nd.ni_vp, &sb);
+ if (error != 0) {
+ goto out1;
+ }
if (sb.st_size >= (plistsize - 1)) { /* leave space for term \0 */
error = EFBIG;
- }
- if (error != 0) {
goto out1;
}