git: f28545524cb1 - releng/13.0 - ifconfig: fix incorrect wg allowed-ips netmask

[Philip Paeps]

The branch releng/13.0 has been updated by philip:

URL: https://cgit.FreeBSD.org/src/commit/?id=f28545524cb197a5df9ebd8d2019f200801d538a

commit f28545524cb197a5df9ebd8d2019f200801d538a
Author:     Michael Chiu <nyan at myuji.xyz>
AuthorDate: 2021-02-15 00:38:26 +0000
Commit:     Philip Paeps <philip at FreeBSD.org>
CommitDate: 2021-02-16 21:11:45 +0000

    ifconfig: fix incorrect wg allowed-ips netmask
    
    Currently when peer information is displayed with `ifconfig wgN peer ..`
    or `ifconfig wgN peer-list`, the netmask of the first `allowed-ips` will
    be used as the netmask of all CIDR in `allowed-ips`.  For example, if
    the list is `192.168.1.0/24, 172.16.0.0/16`, it will display as
    `192.168.1.0/24, 172.16.0.0/24`. While this does not affect the actual
    functionality, it is very confusing.
    
    Submitted by:   Michael Chiu <nyan -at- myuji.xyz>
    Reviewed by:    grehan
    Differential Revision: https://reviews.freebsd.org/D28655
    Approved by:    re (gjb)
    
    (cherry picked from commit be2003ccfa1b12f372fa1329c38c29fe035f232f)
---
 sbin/ifconfig/ifwg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/ifconfig/ifwg.c b/sbin/ifconfig/ifwg.c
index 8956e3427dd1..a2b22d2dfbef 100644
--- a/sbin/ifconfig/ifwg.c
+++ b/sbin/ifconfig/ifwg.c
@@ -309,7 +309,7 @@ dump_peer(const nvlist_t *nvl_peer)
 
 		sa = __DECONST(void *, &aips[i].a_addr);
 		bitmask = __DECONST(void *,
-		    ((const struct sockaddr *)&aips->a_mask)->sa_data);
+		    ((const struct sockaddr *)&(&aips[i])->a_mask)->sa_data);
 		family = aips[i].a_addr.ss_family;
 		getnameinfo(sa, sa->sa_len, addr_buf, INET6_ADDRSTRLEN, NULL,
 		    0, NI_NUMERICHOST);