Fix a use after free, where the already freed p->opt.source was used by

pcap_cleanup_bpf() to disable monitor mode on 802.11 devices.

feedback blambert@
ok deraadt@ mikeb@ millert@

diff --git a/lib/libpcap/pcap-bpf.c b/lib/libpcap/pcap-bpf.c
index 12a7130..5ca4468 100644 (file)
--- a/lib/libpcap/pcap-bpf.c
+++ b/lib/libpcap/pcap-bpf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pcap-bpf.c,v 1.24 2014/10/16 20:08:21 deraadt Exp $   */
+/*     $OpenBSD: pcap-bpf.c,v 1.25 2015/01/16 03:04:19 lteo Exp $      */
 
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1998
@@ -431,9 +431,8 @@ pcap_cleanup_bpf(pcap_t *p)
 void
 pcap_close(pcap_t *p)
 {
-       if (p->opt.source != NULL)
-               free(p->opt.source);
        pcap_cleanup_bpf(p);
+       free(p->opt.source);
        free(p);
 }