Fri May 1 01:34:58 2020 UTC ()

Zero rndsource before using it.

XXX pullup


(riastradh)

diff -r1.61 -r1.62 src/sys/dev/ic/pckbc.c

--- src/sys/dev/ic/pckbc.c 2019/11/10 21:16:35	1.61
+++ src/sys/dev/ic/pckbc.c 2020/05/01 01:34:57	1.62

 @@ -1,14 +1,14 @@
-/* $NetBSD: pckbc.c,v 1.61 2019/11/10 21:16:35 chs Exp $ */
+/* $NetBSD: pckbc.c,v 1.62 2020/05/01 01:34:57 riastradh Exp $ */
 /*
  * Copyright (c) 2004 Ben Harris.
  * Copyright (c) 1998
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.61 2019/11/10 21:16:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.62 2020/05/01 01:34:57 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 @@ -252,29 +252,32 @@ pckbc_attach_slot(struct pckbc_softc *sc
 		    M_DEVBUF, M_WAITOK);
 		t->t_slotdata[slot] = sdata;
 		pckbc_init_slotdata(t->t_slotdata[slot]);
 		alloced++;
+	}
 	child = pckbport_attach_slot(sc->sc_dv, t->t_pt, slot);
 	if (child == NULL && alloced) {
 		free(t->t_slotdata[slot], M_DEVBUF);
 		t->t_slotdata[slot] = NULL;
+	}
-	if (child != NULL && t->t_slotdata[slot] != NULL)
+	if (child != NULL && t->t_slotdata[slot] != NULL) {
 		memset(&t->t_slotdata[slot]->rnd_source, 0,
 		    sizeof(t->t_slotdata[slot]->rnd_source));
 		rnd_attach_source(&t->t_slotdata[slot]->rnd_source,
 		    device_xname(child), RND_TYPE_TTY, RND_FLAG_DEFAULT);
+	}
 	return child != NULL;
+}
 void
 pckbc_attach(struct pckbc_softc *sc)
+{
 	struct pckbc_internal *t;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh_d, ioh_c;
 	int res;
 	u_char cmdbits = 0;