From owner-svn-src-stable-10@freebsd.org  Wed Oct 19 13:42:42 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 43C1DC18879;
 Wed, 19 Oct 2016 13:42:42 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1373E8B;
 Wed, 19 Oct 2016 13:42:42 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9JDgfA2063457;
 Wed, 19 Oct 2016 13:42:41 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9JDgfL7063456;
 Wed, 19 Oct 2016 13:42:41 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201610191342.u9JDgfL7063456@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 19 Oct 2016 13:42:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r307635 - stable/10/sys/dev/kbd
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Oct 2016 13:42:42 -0000

Author: emaste
Date: Wed Oct 19 13:42:40 2016
New Revision: 307635
URL: https://svnweb.freebsd.org/changeset/base/307635

Log:
  MFC r307145:
  
  Use M_WAITOK in PIO_KEYMAP ioctl
  
  The malloc return value is not checked.

Modified:
  stable/10/sys/dev/kbd/kbd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/kbd/kbd.c
==============================================================================
--- stable/10/sys/dev/kbd/kbd.c	Wed Oct 19 13:37:43 2016	(r307634)
+++ stable/10/sys/dev/kbd/kbd.c	Wed Oct 19 13:42:40 2016	(r307635)
@@ -888,7 +888,7 @@ genkbd_commonioctl(keyboard_t *kbd, u_lo
 	case PIO_KEYMAP:	/* set keyboard translation table */
 	case OPIO_KEYMAP:	/* set keyboard translation table (compat) */
 #ifndef KBD_DISABLE_KEYMAP_LOAD
-		mapp = malloc(sizeof *mapp, M_TEMP, M_NOWAIT);
+		mapp = malloc(sizeof *mapp, M_TEMP, M_WAITOK);
 		if (cmd == OPIO_KEYMAP) {
 			omapp = (okeymap_t *)arg;
 			mapp->n_keys = omapp->n_keys;