From owner-svn-src-all@FreeBSD.ORG Fri May 16 16:17:06 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE20A4EA; Fri, 16 May 2014 16:17:06 +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 CAF4A2FB6; Fri, 16 May 2014 16:17:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GGH6gl033408; Fri, 16 May 2014 16:17:06 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GGH6kR033407; Fri, 16 May 2014 16:17:06 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201405161617.s4GGH6kR033407@svn.freebsd.org> From: Hans Petter Selasky Date: Fri, 16 May 2014 16:17:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r266259 - stable/8/sys/dev/usb X-SVN-Group: stable-8 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.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2014 16:17:07 -0000 Author: hselasky Date: Fri May 16 16:17:06 2014 New Revision: 266259 URL: http://svnweb.freebsd.org/changeset/base/266259 Log: MFC r265779: Fix for NULL pointer. Modified: stable/8/sys/dev/usb/usb_pf.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/usb_pf.c ============================================================================== --- stable/8/sys/dev/usb/usb_pf.c Fri May 16 16:14:37 2014 (r266258) +++ stable/8/sys/dev/usb/usb_pf.c Fri May 16 16:17:06 2014 (r266259) @@ -261,7 +261,7 @@ usbpf_xfertap(struct usb_xfer *xfer, int /* sanity checks */ if (usb_no_pf != 0) return; - if (bus->ifp == NULL) + if (bus->ifp == NULL || bus->ifp->if_bpf == NULL) return; if (!bpf_peers_present(bus->ifp->if_bpf)) return;