From 693d381624fa8e511a6f41bcc29121c9c094676a Mon Sep 17 00:00:00 2001
From: Eugene Grosbein <eugen@FreeBSD.org>
Date: Thu, 9 Jan 2020 11:58:26 +0000
Subject: [PATCH] arp(8): avoid segfaulting due to out-of-bounds memory access

Fix obvious mistake that sometimes results in reading memory
past end of an array.

PR:		240825
MFC after:	1 week
---
 usr.sbin/arp/arp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index e1a2801c30b..07e07f1f2da 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -627,8 +627,7 @@ print_entry(struct sockaddr_dl *sdl,
 	} else
 		xo_emit("{d:/(incomplete)}{en:incomplete/true}");
 
-	for (p = ifnameindex; p && ifnameindex->if_index &&
-	    ifnameindex->if_name; p++) {
+	for (p = ifnameindex; p && p->if_index && p->if_name; p++) {
 		if (p->if_index == sdl->sdl_index) {
 			xo_emit(" on {:interface/%s}", p->if_name);
 			break;