From: krw <krw@openbsd.org>
Date: Sat, 29 Jul 2023 15:59:27 +0000 (+0000)
Subject: Check for NULL before de-referencing a pointer, not after.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5cf63f2f3709cbaea512410e5f5de23110dd7980;p=openbsd

Check for NULL before de-referencing a pointer, not after.

Coverity CID #1566406

ok phessler@
---

diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 30b8ffedbc2..92cc4e330f4 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_nbr.c,v 1.149 2023/05/07 16:23:24 bluhm Exp $	*/
+/*	$OpenBSD: nd6_nbr.c,v 1.150 2023/07/29 15:59:27 krw Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -1160,8 +1160,7 @@ nd6_dad_timer(void *xifa)
 {
 	struct ifaddr *ifa = xifa;
 	struct in6_ifaddr *ia6 = ifatoia6(ifa);
-	struct in6_addr taddr6 = ia6->ia_addr.sin6_addr;
-	struct in6_addr daddr6;
+	struct in6_addr daddr6, taddr6;
 	struct ifnet *ifp = ifa->ifa_ifp;
 	struct dadq *dp;
 	char addr[INET6_ADDRSTRLEN];
@@ -1173,6 +1172,7 @@ nd6_dad_timer(void *xifa)
 		log(LOG_ERR, "%s: called with null parameter\n", __func__);
 		goto done;
 	}
+	taddr6 = ia6->ia_addr.sin6_addr;
 	dp = nd6_dad_find(ifa);
 	if (dp == NULL) {
 		log(LOG_ERR, "%s: DAD structure not found\n", __func__);