CVS commit: src/sys/dev/isa

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Tue Nov 12 13:10:51 UTC 2019

Modified Files:
        src/sys/dev/isa: uha_isa.c

Log Message:
 Initialize sc_dev correctly to avoid null pointer dereference when
bus_space_map() failed.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/isa/uha_isa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/isa/uha_isa.c
diff -u src/sys/dev/isa/uha_isa.c:1.41 src/sys/dev/isa/uha_isa.c:1.42
--- src/sys/dev/isa/uha_isa.c:1.41	Sat Oct 18 08:33:28 2014
+++ src/sys/dev/isa/uha_isa.c	Tue Nov 12 13:10:51 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: uha_isa.c,v 1.41 2014/10/18 08:33:28 snj Exp $	*/
+/*	$NetBSD: uha_isa.c,v 1.42 2019/11/12 13:10:51 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.41 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.42 2019/11/12 13:10:51 msaitoh Exp $");
 
 #include "opt_ddb.h"
 
@@ -143,6 +143,7 @@ uha_isa_attach(device_t parent, device_t
 	isa_chipset_tag_t ic = ia->ia_ic;
 	int error;
 
+	sc->sc_dev = self;
 	printf("\n");
 
 	if (bus_space_map(iot, ia->ia_io[0].ir_addr, UHA_ISA_IOSIZE, 0, &ioh)) {
@@ -150,7 +151,6 @@ uha_isa_attach(device_t parent, device_t
 		return;
 	}
 
-	sc->sc_dev = self;
 	sc->sc_iot = iot;
 	sc->sc_ioh = ioh;
 	sc->sc_dmat = dmat;