[src/netbsd-7-1]: src/sys/dev Apply patch (requested by chs in ticket #1429):

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/995bc6d3469e
branches:  netbsd-7-1
changeset: 800741:995bc6d3469e
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Jul 08 16:13:55 2017 +0000

description:
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.

diffstat:

 sys/dev/cgd.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 2aeb100a01a3 -r 995bc6d3469e sys/dev/cgd.c
--- a/sys/dev/cgd.c     Wed Jun 21 17:18:06 2017 +0000
+++ b/sys/dev/cgd.c     Sat Jul 08 16:13:55 2017 +0000
@@ -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.1.4.1 2017/07/08 16:13:55 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.1.4.1 2017/07/08 16:13:55 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -586,12 +586,16 @@
                 */
                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);
        }
 }