From: Roy Marples <roy@marples.name>
Date: Sun, 10 May 2020 15:19:09 +0000 (+0100)
Subject: privsep: Fix prior for non pledge systems
X-Git-Tag: v9.1.0~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1cdebfc5d41c26ac6f1906008b62a7541c64d1d;p=thirdparty%2Fdhcpcd.git

privsep: Fix prior for non pledge systems
---

diff --git a/src/if-bsd.c b/src/if-bsd.c
index e75952e2..d3c684bf 100644
--- a/src/if-bsd.c
+++ b/src/if-bsd.c
@@ -366,7 +366,7 @@ static int if_indirect_ioctl(struct dhcpcd_ctx *ctx,
 #else
 	struct ifreq ifr = { .ifr_flags = 0 };
 
-	strlcpy(data, ifname, IFNAMSIZ);
+	strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);
 	ifr.ifr_data = data;
 	UNUSED(len);
 	return ioctl(ctx->pf_inet_fd, cmd, &ifr);
@@ -448,9 +448,8 @@ int
 if_vimaster(struct dhcpcd_ctx *ctx, const char *ifname)
 {
 	int r;
-	struct ifmediareq ifmr;
+	struct ifmediareq ifmr = { .ifm_active = 0 };
 
-	memset(&ifmr, 0, sizeof(ifmr));
 	strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
 	r = ioctl(ctx->pf_inet_fd, SIOCGIFMEDIA, &ifmr);
 	if (r == -1)