[src/trunk]: src/sys/dev CID 1362902: forward null

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

details:   https://anonhg.NetBSD.org/src/rev/1744cdb19cb4
branches:  trunk
changeset: 346129:1744cdb19cb4
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jun 27 18:27:51 2016 +0000

description:
CID 1362902: forward null
CID 136290{3,4}: missing break

diffstat:

 sys/dev/dksubr.c |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 2883b7e0adaf -r 1744cdb19cb4 sys/dev/dksubr.c
--- a/sys/dev/dksubr.c  Mon Jun 27 12:01:03 2016 +0000
+++ b/sys/dev/dksubr.c  Mon Jun 27 18:27:51 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.87 2016/06/26 07:22:15 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.88 2016/06/27 18:27:51 christos Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.87 2016/06/26 07:22:15 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.88 2016/06/27 18:27:51 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -659,12 +659,14 @@
 
                mutex_enter(&dksc->sc_iolock);
                if (dksc->sc_bufq != NULL)
-                       strlcpy(dks->dks_name, bufq_getstrategyname(dksc->sc_bufq),
+                       strlcpy(dks->dks_name,
+                           bufq_getstrategyname(dksc->sc_bufq),
                            sizeof(dks->dks_name));
                else
                        error = EINVAL;
                mutex_exit(&dksc->sc_iolock);
                dks->dks_paramlen = 0;
+               break;
            }
 
        case DIOCSSTRATEGY:
@@ -684,10 +686,13 @@
                }
                mutex_enter(&dksc->sc_iolock);
                old = dksc->sc_bufq;
-               bufq_move(new, old);
+               if (old)
+                       bufq_move(new, old);
                dksc->sc_bufq = new;
                mutex_exit(&dksc->sc_iolock);
-               bufq_free(old);
+               if (old)
+                       bufq_free(old);
+               break;
            }
 
        default: