From owner-svn-src-head@FreeBSD.ORG  Wed Apr 29 15:41:19 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CC18C794;
 Wed, 29 Apr 2015 15:41:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 BAA021FB7;
 Wed, 29 Apr 2015 15:41:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TFfJRP072153;
 Wed, 29 Apr 2015 15:41:19 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TFfJMq072138;
 Wed, 29 Apr 2015 15:41:19 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201504291541.t3TFfJMq072138@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 29 Apr 2015 15:41:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282226 - head/sys/dev/kbdmux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Apr 2015 15:41:19 -0000

Author: pfg
Date: Wed Apr 29 15:41:19 2015
New Revision: 282226
URL: https://svnweb.freebsd.org/changeset/base/282226

Log:
  Plug memory leaks in kbdmux(4) (take 2)
  
  This is a fix to the previous attempt in r281889, which some (most?)
  keyboards.
  
  Discussed with:	emaste, jkim
  
  Found by:	clang static analyzer
  CID:		1007072
  CID:		1007073
  CID:		1007074

Modified:
  head/sys/dev/kbdmux/kbdmux.c

Modified: head/sys/dev/kbdmux/kbdmux.c
==============================================================================
--- head/sys/dev/kbdmux/kbdmux.c	Wed Apr 29 15:33:55 2015	(r282225)
+++ head/sys/dev/kbdmux/kbdmux.c	Wed Apr 29 15:41:19 2015	(r282226)
@@ -470,6 +470,10 @@ kbdmux_init(int unit, keyboard_t **kbdp,
 		KBDMUX_LOCK(state);
 		callout_reset(&state->ks_timo, TICKS, kbdmux_kbd_intr_timo, state);
 		KBDMUX_UNLOCK(state);
+	} else if (needfree) {
+		free(accmap, M_KBDMUX);
+		free(fkeymap, M_KBDMUX);
+		free(keymap, M_KBDMUX);
 	}
 
 	return (0);