Module Name: src
Committed By: christos
Date: Sun Dec 20 01:34:00 UTC 2015
Modified Files:
src/sys/fs/puffs: puffs_vfsops.c
Log Message:
PR/50573: Andreas Gustafsson: puffs can crash kernel for lack of argument
checking
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/fs/puffs/puffs_vfsops.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/fs/puffs/puffs_vfsops.c
diff -u src/sys/fs/puffs/puffs_vfsops.c:1.117 src/sys/fs/puffs/puffs_vfsops.c:1.118
--- src/sys/fs/puffs/puffs_vfsops.c:1.117 Mon Feb 16 05:49:39 2015
+++ src/sys/fs/puffs/puffs_vfsops.c Sat Dec 19 20:34:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vfsops.c,v 1.117 2015/02/16 10:49:39 martin Exp $ */
+/* $NetBSD: puffs_vfsops.c,v 1.118 2015/12/20 01:34:00 christos Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.117 2015/02/16 10:49:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.118 2015/12/20 01:34:00 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -269,8 +269,22 @@ puffs_vfsop_mount(struct mount *mp, cons
/* XXX: check parameters */
pmp->pmp_root_cookie = args->pa_root_cookie;
+ switch (args->pa_root_vtype) {
+ case VNON: case VREG: case VDIR: case VBLK:
+ case VCHR: case VLNK: case VSOCK: case VFIFO:
+ break;
+ default:
+ error = EINVAL;
+ goto out;
+ }
pmp->pmp_root_vtype = args->pa_root_vtype;
+
+ if (args->pa_root_vsize < 0) {
+ error = EINVAL;
+ goto out;
+ }
pmp->pmp_root_vsize = args->pa_root_vsize;
+
pmp->pmp_root_rdev = args->pa_root_rdev;
pmp->pmp_docompat = args->pa_time32;
