From owner-p4-projects@FreeBSD.ORG  Tue Jul 19 12:15:21 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C17A1065672; Tue, 19 Jul 2011 12:15:21 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2FE5106566B
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 12:15:20 +0000 (UTC)
	(envelope-from syuu@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B1B8E8FC15
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 12:15:20 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6JCFKuE080550
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 12:15:20 GMT
	(envelope-from syuu@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JCFKSD080547
	for perforce@freebsd.org; Tue, 19 Jul 2011 12:15:20 GMT
	(envelope-from syuu@FreeBSD.org)
Date: Tue, 19 Jul 2011 12:15:20 GMT
Message-Id: <201107191215.p6JCFKSD080547@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	syuu@FreeBSD.org using -f
From: Takuya ASADA <syuu@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196397 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jul 2011 12:15:21 -0000

http://p4web.freebsd.org/@@196397?ac=10

Change 196397 by syuu@kikurage on 2011/07/19 12:14:18

	NULL check before free()

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#14 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#14 (text+ko) ====

@@ -1568,8 +1568,11 @@
 				break;
 			}
 			d->bd_qmask.qm_enabled = FALSE;
-			free(d->bd_qmask.qm_rxq_mask, M_BPF);
-			free(d->bd_qmask.qm_txq_mask, M_BPF);
+			
+			if (d->bd_qmask.qm_rxq_mask != NULL)
+				free(d->bd_qmask.qm_rxq_mask, M_BPF);
+			if (d->bd_qmask.qm_txq_mask != NULL)
+				free(d->bd_qmask.qm_txq_mask, M_BPF);
 			break;
 		}