From: deraadt <deraadt@openbsd.org>
Date: Sun, 11 Jan 2015 03:04:53 +0000 (+0000)
Subject: use mallocarray() when reallocating the mux table
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=88c36d477c52dae5d6be9b1db67b2221c91baef0;p=openbsd

use mallocarray() when reallocating the mux table
---

diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index 8546c0de920..8068ede2e1a 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsmux.c,v 1.27 2014/07/12 18:48:53 tedu Exp $	*/
+/*	$OpenBSD: wsmux.c,v 1.28 2015/01/11 03:04:53 deraadt Exp $	*/
 /*      $NetBSD: wsmux.c,v 1.37 2005/04/30 03:47:12 augustss Exp $      */
 
 /*
@@ -133,8 +133,8 @@ wsmux_getmux(int n)
 	/* Make sure there is room for mux n in the table */
 	if (n >= nwsmux) {
 		old = wsmuxdevs;
-		new = (struct wsmux_softc **)
-		    malloc((n + 1) * sizeof (*wsmuxdevs), M_DEVBUF, M_NOWAIT);
+		new = mallocarray(n + 1, sizeof (*wsmuxdevs),
+		    M_DEVBUF, M_NOWAIT);
 		if (new == NULL) {
 			printf("wsmux_getmux: no memory for mux %d\n", n);
 			return (NULL);