From owner-svn-src-all@FreeBSD.ORG  Thu Apr 23 14:53:46 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4D4E43C8;
 Thu, 23 Apr 2015 14:53:46 +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 3CB671885;
 Thu, 23 Apr 2015 14:53:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3NErkaf011354;
 Thu, 23 Apr 2015 14:53:46 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3NErk1t011353;
 Thu, 23 Apr 2015 14:53:46 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201504231453.t3NErk1t011353@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: Thu, 23 Apr 2015 14:53:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281889 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Apr 2015 14:53:46 -0000

Author: pfg
Date: Thu Apr 23 14:53:45 2015
New Revision: 281889
URL: https://svnweb.freebsd.org/changeset/base/281889

Log:
  Plug memory leaks in kbdmux(4)
  
  Al kudos here for the Clang static analyzer which, unlike Coverity,
  failed to flag a false positive.
  
  Found by:	clang static analyzer
  CID:		1007072
  CID:		1007073
  CID:		1007074
  
  MFC after:	1 week

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

Modified: head/sys/dev/kbdmux/kbdmux.c
==============================================================================
--- head/sys/dev/kbdmux/kbdmux.c	Thu Apr 23 14:36:01 2015	(r281888)
+++ head/sys/dev/kbdmux/kbdmux.c	Thu Apr 23 14:53:45 2015	(r281889)
@@ -472,6 +472,11 @@ kbdmux_init(int unit, keyboard_t **kbdp,
 		KBDMUX_UNLOCK(state);
 	}
 
+	if (needfree) {
+		free(accmap, M_KBDMUX);
+		free(fkeymap, M_KBDMUX);
+		free(keymap, M_KBDMUX);
+	}
 	return (0);
 bad:
 	if (needfree) {