From owner-svn-src-stable-8@FreeBSD.ORG Mon Oct 10 17:53:07 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F4FA1065673; Mon, 10 Oct 2011 17:53:07 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0E2DA8FC13; Mon, 10 Oct 2011 17:53:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9AHr6IB073919; Mon, 10 Oct 2011 17:53:06 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9AHr6Sk073916; Mon, 10 Oct 2011 17:53:06 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201110101753.p9AHr6Sk073916@svn.freebsd.org> From: Christian Brueffer Date: Mon, 10 Oct 2011 17:53:06 +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: r226225 - stable/8/sys/dev/ppbus X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Oct 2011 17:53:07 -0000 Author: brueffer Date: Mon Oct 10 17:53:06 2011 New Revision: 226225 URL: http://svn.freebsd.org/changeset/base/226225 Log: MFC: r198358 Check pointer for NULL before dereferencing it, not after. Modified: stable/8/sys/dev/ppbus/lpt.c stable/8/sys/dev/ppbus/pcfclock.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) Modified: stable/8/sys/dev/ppbus/lpt.c ============================================================================== --- stable/8/sys/dev/ppbus/lpt.c Mon Oct 10 17:41:11 2011 (r226224) +++ stable/8/sys/dev/ppbus/lpt.c Mon Oct 10 17:53:06 2011 (r226225) @@ -486,12 +486,15 @@ lptopen(struct cdev *dev, int flags, int { int trys, err; struct lpt_data *sc = dev->si_drv1; - device_t lptdev = sc->sc_dev; - device_t ppbus = device_get_parent(lptdev); + device_t lptdev; + device_t ppbus; if (!sc) return (ENXIO); + lptdev = sc->sc_dev; + ppbus = device_get_parent(lptdev); + ppb_lock(ppbus); if (sc->sc_state) { lprintf(("%s: still open %x\n", device_get_nameunit(lptdev), Modified: stable/8/sys/dev/ppbus/pcfclock.c ============================================================================== --- stable/8/sys/dev/ppbus/pcfclock.c Mon Oct 10 17:41:11 2011 (r226224) +++ stable/8/sys/dev/ppbus/pcfclock.c Mon Oct 10 17:53:06 2011 (r226225) @@ -150,12 +150,14 @@ static int pcfclock_open(struct cdev *dev, int flag, int fms, struct thread *td) { struct pcfclock_data *sc = dev->si_drv1; - device_t pcfclockdev = sc->dev; - device_t ppbus = device_get_parent(pcfclockdev); + device_t pcfclockdev; + device_t ppbus; int res; if (!sc) return (ENXIO); + pcfclockdev = sc->dev; + ppbus = device_get_parent(pcfclockdev); ppb_lock(ppbus); res = ppb_request_bus(ppbus, pcfclockdev,