From: Igor Ryzhov <iryzhov@nfware.com>
Date: Wed, 19 May 2021 13:24:21 +0000 (+0300)
Subject: pbrd: fix coverity warning
X-Git-Tag: base_8.1~519^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F8700%2Fhead;p=mirror%2Ffrr.git

pbrd: fix coverity warning

CID 1500586

There was an attempt to fix it in 920bb6f7 but the commit didn't
actually fix the warning.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---

diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c
index e127999b0b..301550deb7 100644
--- a/pbrd/pbr_nht.c
+++ b/pbrd/pbr_nht.c
@@ -721,7 +721,7 @@ pbr_nht_individual_nexthop_gw_update(struct pbr_nexthop_cache *pnhc,
 	 * So let's search and do the right thing on the
 	 * interface event.
 	 */
-	if (!pnhi->nhr && pnhi->ifp) {
+	if (!pnhi->nhr) {
 		switch (pnhc->nexthop.type) {
 		case NEXTHOP_TYPE_BLACKHOLE:
 		case NEXTHOP_TYPE_IPV4:
@@ -738,20 +738,18 @@ pbr_nht_individual_nexthop_gw_update(struct pbr_nexthop_cache *pnhc,
 		goto done;
 	}
 
-	if (pnhi->nhr) {
-		switch (pnhi->nhr->prefix.family) {
-		case AF_INET:
-			if (pnhc->nexthop.gate.ipv4.s_addr
-			    != pnhi->nhr->prefix.u.prefix4.s_addr)
-				goto done; /* Unrelated change */
-			break;
-		case AF_INET6:
-			if (memcmp(&pnhc->nexthop.gate.ipv6,
-				   &pnhi->nhr->prefix.u.prefix6, 16)
-			    != 0)
-				goto done; /* Unrelated change */
-			break;
-		}
+	switch (pnhi->nhr->prefix.family) {
+	case AF_INET:
+		if (pnhc->nexthop.gate.ipv4.s_addr
+		    != pnhi->nhr->prefix.u.prefix4.s_addr)
+			goto done; /* Unrelated change */
+		break;
+	case AF_INET6:
+		if (memcmp(&pnhc->nexthop.gate.ipv6,
+			   &pnhi->nhr->prefix.u.prefix6, 16)
+		    != 0)
+			goto done; /* Unrelated change */
+		break;
 	}
 
 	pnhi->nhr_matched = true;