From 3127f596ce77034eae5c35991cf0ab72cab189b7 Mon Sep 17 00:00:00 2001
From: eugen <eugen@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 16 Jan 2020 08:27:30 +0000
Subject: [PATCH] MFC r356551: 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:             242784


git-svn-id: svn://svn.freebsd.org/base/stable/10@356780 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 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 60079d47c..2d2fe893c 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -607,8 +607,7 @@ print_entry(struct sockaddr_dl *sdl,
 	} else
 		printf("(incomplete)");
 
-	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) {
 			printf(" on %s", p->if_name);
 			break;
-- 
2.42.0