svn commit: r206186 - stable/7/sys/net

[Jung-uk Kim]

Author: jkim
Date: Mon Apr  5 17:33:33 2010
New Revision: 206186
URL: http://svn.freebsd.org/changeset/base/206186

Log:
  MFC:	r205858
  
  Check the pointer to JIT binary filter before its de-allocation.

Modified:
  stable/7/sys/net/bpf.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/net/bpf.c
==============================================================================
--- stable/7/sys/net/bpf.c	Mon Apr  5 17:32:49 2010	(r206185)
+++ stable/7/sys/net/bpf.c	Mon Apr  5 17:33:33 2010	(r206186)
@@ -1586,13 +1586,14 @@ bpf_freed(struct bpf_d *d)
 		if (d->bd_fbuf != NULL)
 			free(d->bd_fbuf, M_BPF);
 	}
-	if (d->bd_rfilter) {
+	if (d->bd_rfilter != NULL) {
 		free((caddr_t)d->bd_rfilter, M_BPF);
 #ifdef BPF_JITTER
-		bpf_destroy_jit_filter(d->bd_bfilter);
+		if (d->bd_bfilter != NULL)
+			bpf_destroy_jit_filter(d->bd_bfilter);
 #endif
 	}
-	if (d->bd_wfilter)
+	if (d->bd_wfilter != NULL)
 		free((caddr_t)d->bd_wfilter, M_BPF);
 	mtx_destroy(&d->bd_mtx);
 }