From nobody Wed Apr 29 18:59:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g5RSP1GXQz6bhc2 for ; Wed, 29 Apr 2026 18:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5RSN3rB3z3mxl for ; Wed, 29 Apr 2026 18:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777489188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b2DbqByfCg6qK4sJYyNngRMEVu+bwD2UivMlHQ2+0Tg=; b=uve8nLchgwrSfqjCA20i41ckRvNQtc3EM877nrweVE5xdHcslepumXZ/Wn6lm/Igo3vMx9 C+UEJvfFXeHCEsUJLDn6CCQ1JzLHQakzOqwgywbnPLXVsZGtCiLdj+lcAfaoWx86ZBnBhf 6y5b9fynh/BapI+w0qjvwpWtlhzfcPB7hQwrkH96KHBoVS/+EOSWBTTVZ4Z2PxiP6P3Iqq cJhUiRPgmtRJPj+tC2qyqoGCRT7kBS9Y600lky2eB97hNoG5Ms/kSnhZSJyEnl8CkGnbYr tvllPTUVz2mL6JtpGAeh6Kr+IrGENPmWwSZ+8wkNRNw2jC13npGk55IsY/d/JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777489188; a=rsa-sha256; cv=none; b=dIdAn2qT6MOtSRn1Y8Zm3A/dyPG+IvV5MMmUZuid5M78rgSH7BcZV35tKSV4E+JTADaF1r PlFuk96hSIUFDwX1H36090A18ner4DmkiJvhLA/o7LB90PLQaboG3l+UCxnUD9GsehDWj0 y721PqcMev3+RCL2q6eh3FE4Uh2fzHrVp9m4LNzO9mqvZqVkKACmYpJSCLle8r7r6fWlQR qk6Py9vzxZHoHWyNCtq107stLoEK5xRct+ukSq9F+Ty9I8vmLljhKWhVnnbA4rpDJQwj3E Qe2LNPWXmU3yc36+aQY/hGndGMfiAexXe96JDtvOP8y1F6gCxPYwXJ8gCAoriw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777489188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b2DbqByfCg6qK4sJYyNngRMEVu+bwD2UivMlHQ2+0Tg=; b=ef7NsAaEXBELtnR67fqnmkcXcR7QNlNnjBQyiozpIGd8dz9mTJKRzS/up7AjZpDy+O591q xDGgD+ffvOpGK2wCDMpILpTlRoZy1HH27BfLampz1QQxuRqi6vFs+7aaXbyQiuz+dCr7U5 vdtuweWNer+E4pc2RLNhhl2PEq9P4LKjjZ9CAqA1bsLIFD4epylPyW5/Qv05UaKcDeYlWM /1SmE/k0qFA6/15aHWP6SQnT39H/UmVe9UameOf156o3aA2o77wcjzIZKwCPMa9ECWNxKt YCDNhzY1d7MuKf+yVSDG+OYP/i6XiJsYH31k9YA3eEHBn3eHZ9QlUKplr+5UKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5RSN3QD9zt6f for ; Wed, 29 Apr 2026 18:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38385 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 18:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: c5a92616c41f - main - if_gre(4): Fix gre_clone_dump_nl address dump List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5a92616c41f9132d585c533e66dee88e98c73f2 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 18:59:48 +0000 Message-Id: <69f25524.38385.c9f1cef@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=c5a92616c41f9132d585c533e66dee88e98c73f2 commit c5a92616c41f9132d585c533e66dee88e98c73f2 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-04-29 17:42:27 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-04-29 18:57:46 +0000 if_gre(4): Fix gre_clone_dump_nl address dump Fix stack overflow by passing in_aliasreq instead of ifr during netlink dump. Fixes: e1e18cc12e68 ("if_gre: Add netlink support with tests") --- sys/net/if_gre.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index f8036bf4446d..563478eb67f8 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -297,7 +297,6 @@ gre_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) { GRE_RLOCK_TRACKER; struct gre_softc *sc; - struct ifreq ifr; nlattr_add_u32(nw, IFLA_LINK, ifp->if_index); nlattr_add_string(nw, IFLA_IFNAME, ifp->if_xname); @@ -318,21 +317,23 @@ gre_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) if (sc->gre_family == AF_INET) { #ifdef INET - if (in_gre_ioctl(sc, SIOCGIFPSRCADDR, (caddr_t)&ifr) == 0) - nlattr_add_in_addr(nw, IFLA_GRE_LOCAL, - (const struct in_addr *)&ifr.ifr_addr); - if (in_gre_ioctl(sc, SIOCGIFPDSTADDR, (caddr_t)&ifr) == 0) + struct in_aliasreq in; + if (in_gre_ioctl(sc, SIOCGIFPSRCADDR, (caddr_t)&in) == 0) nlattr_add_in_addr(nw, IFLA_GRE_LOCAL, - (const struct in_addr *)&ifr.ifr_dstaddr); + &in.ifra_addr.sin_addr); + if (in_gre_ioctl(sc, SIOCGIFPDSTADDR, (caddr_t)&in) == 0) + nlattr_add_in_addr(nw, IFLA_GRE_REMOTE, + &in.ifra_addr.sin_addr); #endif } else if (sc->gre_family == AF_INET6) { #ifdef INET6 - if (in6_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&ifr) == 0) - nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL, - (const struct in6_addr *)&ifr.ifr_addr); - if (in6_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&ifr) == 0) + struct in6_aliasreq in6; + if (in6_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&in6) == 0) nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL, - (const struct in6_addr *)&ifr.ifr_dstaddr); + &in6.ifra_addr.sin6_addr); + if (in6_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&in6) == 0) + nlattr_add_in6_addr(nw, IFLA_GRE_REMOTE, + &in6.ifra_addr.sin6_addr); #endif }