Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Oct 2016 13:42:41 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
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
Message-ID:  <201610191342.u9JDgfL7063456@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610191342.u9JDgfL7063456>