Module Name: src
Committed By: snj
Date: Sat Jul 8 16:14:19 UTC 2017
Modified Files:
src/sys/dev [netbsd-7]: cgd.c
Log Message:
Apply patch (requested by chs in ticket #1429):
Avoid crashes by checking if a cgd device has been configured before
processing most ioctls, and failing with ENXIO if the device is not
configured.
To generate a diff of this commit:
cvs rdiff -u -r1.90.2.1 -r1.90.2.2 src/sys/dev/cgd.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/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.90.2.1 src/sys/dev/cgd.c:1.90.2.2
--- src/sys/dev/cgd.c:1.90.2.1 Wed Nov 4 16:25:17 2015
+++ src/sys/dev/cgd.c Sat Jul 8 16:14:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.90.2.1 2015/11/04 16:25:17 riz Exp $ */
+/* $NetBSD: cgd.c,v 1.90.2.2 2017/07/08 16:14:19 snj Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.90.2.1 2015/11/04 16:25:17 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.90.2.2 2017/07/08 16:14:19 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -586,12 +586,16 @@ cgdioctl(dev_t dev, u_long cmd, void *da
*/
if ((flag & FWRITE) == 0)
return (EBADF);
+ if ((dksc->sc_flags & DKF_INITED) == 0)
+ return ENXIO;
/*
* We pass this call down to the underlying disk.
*/
return VOP_IOCTL(cs->sc_tvn, cmd, data, flag, l->l_cred);
default:
+ if ((dksc->sc_flags & DKF_INITED) == 0)
+ return ENXIO;
return dk_ioctl(di, dksc, dev, cmd, data, flag, l);
}
}
