From nobody Wed Apr 29 18:59:48 2026 X-Original-To: dev-commits-src-all@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 4g5RSV23M8z6bhj0 for ; Wed, 29 Apr 2026 18:59:54 +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 4g5RST52l8z3n48 for ; Wed, 29 Apr 2026 18:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777489193; 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=YqwiyHucQ1pkgiDLfRnPs0hKstdmn3A1y8CZPjGOD0cMnQwZe7BAk/OetC+GvRBvtp5pry dU+z5utloWmXogJCWk4M3MTKo/gHlk6v70nw653nHX/15QrC/QWVs4IGolhC85CFg26G5K T5qLOU6GNveuPa14LfCObQwH5NJEE2hkaV6Az4GSIXg89163VeUyZGOcFzEmhEQ1OOSj25 r8vRIp8bKGpbRWvL2hLB0zB+jbq704tWCmGVbo7/unB/cBp6KD/6CChDciSUrfulbpuqvN rqgJLvJbm56cMe4gqM58NuwVUo+4/lQRpDSO/l7p9YYDgFuuPsyAbBH5wzXNHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777489193; a=rsa-sha256; cv=none; b=juL4wPHaDIJQoqGMNdFg8T0J2TTv/bLKdn+bUu3RNDnjaGmfZMt6rc+74+WoGPt22BCXtA uxKatLTv0IOXgpnAu+S8i0VDbYZTGVQgRQfTU2zu8n5BkLIjAr2qODmYfUjBD1WK731R/w fQxaTjYfjyZ7ro2jr8WEhFmafL8rShTlxQOMCumvHzZ777spIPCaTPQI9Oj4l5SifcKail 5tMNvEGJlwvoGH0yTij9+bvRWQxg/GogFBOAkH9v54sIk4J7h7NXW5N4yc5VfYoRK7Cra/ 7AzDjuW5vlYjnXA8LIqE3O60qjHc7YiSAxe+y50RJXsBTlMcbPbqXJ/hYsYfpw== 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=1777489193; 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=YKRc3vUnzk83AvcB9Nv6RiSl+7dSkShFKjTLeo1UBNP5xYxhN/SGg+wmik52dOMJ/AbbJ8 ySynCmoRH3a59YzBDFtZF9vDeLdsDLt5SRe+V+Bal94OLN7hFvQC+GffZE2LphT4kL71Q0 1sI57FN+JoIbl+AEfqj1QKUpvhHAbcppCAUS5ChECQSTiIgd1KzXfiVJ4C4acfdhAB9tiE LS7hJgvIXqvxQgPMoR073DFuIokukIceS8+B3VmfaabHEcDnZMbjjOdvTPeLqxhXNw5+s9 jr49KLvF1bIRWX5MklMf3BFkOZYjADHkFgF4Pv2F961P7rKTf3Anf4WT1BYang== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5RST4ZJYztD7 for ; Wed, 29 Apr 2026 18:59:53 +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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 }