From owner-svn-src-all@FreeBSD.ORG  Thu Jun 10 20:20:46 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5D031065672;
	Thu, 10 Jun 2010 20:20:46 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D3EF28FC18;
	Thu, 10 Jun 2010 20:20:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5AKKk4i054883;
	Thu, 10 Jun 2010 20:20:46 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5AKKkQc054880;
	Thu, 10 Jun 2010 20:20:46 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201006102020.o5AKKkQc054880@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 10 Jun 2010 20:20:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209007 - stable/8/sys/net80211
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 10 Jun 2010 20:20:47 -0000

Author: rpaulo
Date: Thu Jun 10 20:20:46 2010
New Revision: 209007
URL: http://svn.freebsd.org/changeset/base/209007

Log:
  MFC r208699:
   Fix resource leaks in ieee80211_ioctl_setchanlist() in case of error.
  
  Found with:	Coverity Prevent(tm)
  CID:		4115
  Approved by:   re (kensmith)

Modified:
  stable/8/sys/net80211/ieee80211_ioctl.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- stable/8/sys/net80211/ieee80211_ioctl.c	Thu Jun 10 20:15:45 2010	(r209006)
+++ stable/8/sys/net80211/ieee80211_ioctl.c	Thu Jun 10 20:20:46 2010	(r209007)
@@ -1590,8 +1590,10 @@ ieee80211_ioctl_setchanlist(struct ieee8
 	if (list == NULL)
 		return ENOMEM;
 	error = copyin(ireq->i_data, list, ireq->i_len);
-	if (error)
+	if (error) {
+		free(list, M_TEMP);
 		return error;
+	}
 	nchan = 0;
 	chanlist = list + ireq->i_len;		/* NB: zero'd already */
 	maxchan = ireq->i_len * NBBY;
@@ -1607,8 +1609,10 @@ ieee80211_ioctl_setchanlist(struct ieee8
 			nchan++;
 		}
 	}
-	if (nchan == 0)
+	if (nchan == 0) {
+		free(list, M_TEMP);
 		return EINVAL;
+	}
 	if (ic->ic_bsschan != IEEE80211_CHAN_ANYC &&	/* XXX */
 	    isclr(chanlist, ic->ic_bsschan->ic_ieee))
 		ic->ic_bsschan = IEEE80211_CHAN_ANYC;