From nobody Mon May 5 20:50:27 2025 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 4Zrtvl5FP0z5tplT; Mon, 05 May 2025 20:50:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zrtvl4M1rz3jVg; Mon, 05 May 2025 20:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746478227; 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=OrSajc4z2BJn5MoJcyLFN2HE5oDgjzVRbwfXPBncMnc=; b=YWEmlL/HE5AQ0tJJpqmUzXSwctUiSSElomjDPyljy7fB+CJg/mlYNKtauR50qezqppJZid s9Mqqooy1FMcafRKSbbG+3v1Mm/6rHt9DKpzhUTOFeg1cuLk5Q6gFPJZJPrFy5ISJszrWo MUtODNPqf2sFr+J1dICLN5mEr1nwObBaJcUlhx1k5YB2jTVX3rK/ge0wRnZfFi7/oK/hmF TF6bY/BetidoqKkkcl1TGzj2pDoxZ3rKTA/gpOo7y9c12Se2pNvzOUxlcz7+N8MgliIIXI kTpKlMDJ+H1/Vm4qnPnEvw9AV9FbcPF5l0lD93KO9WunENr5j+g6T9PBiyZlqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746478227; 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=OrSajc4z2BJn5MoJcyLFN2HE5oDgjzVRbwfXPBncMnc=; b=wG8D4dZBgI1m47nhdXa3uci3Tpq/Xk0XKMi29YjqjPRjfo4wYW39O/HquOy7F0VkNyfUj+ HgDIwrC1A6szUxghvemXdwJKqhmorqOPxPEshaTrrBJGoaTtChe/cpcpNXD6mrqYG7ABBa TClStFaMAPCI2fuDvIqpOjCu8f/n/E/meUUvlBJs5xNF1PsyRdstFCBeju1uNh1MlJxvcy 9FbkISgQqGLtKXf2Lpu0OZQWbbKxJeblzjQMMxdxwYSydP/7JEY9MGq1DuAj1v/BUeiwzr M0ZZwRAl2TzQgipOPIgeQfhwD7np9RkvLK3kzIGIhrVGaNgnCWfU5NKrdtD78g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746478227; a=rsa-sha256; cv=none; b=PBYS0VsTACm1qOQXxJnxT91JPjlQkxuw3/SJMMDTfojphUM6TRDiO6nstYMLjme9piilqq lhkV2BZ5Y9VfmZOq8/b6TdULZElgzGG+7+3xd5QbilCxesYX3QF7p5SIOfquRLHmY+MJqb glYiXVTh43/wDjkuuUm1M/6fAGHa0g68SVH5Asl6ywALBTFnaGVTlr2UtW3N9gmQdrgrEn i7EO59sVpz+jHlA5+euiIql6b0yluI0c/w6qljjz9Ifb2gvxDrwplYW5+I2ccvZ4vThBEP 1lGKB48+cTS/QN/i1QPJv4WR1D6hWTU21mPb6vV8KrE/WoSYQT1+mBLUFG5Zmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zrtvl3m2TzTkc; Mon, 05 May 2025 20:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545KoRbb089136; Mon, 5 May 2025 20:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545KoR9R089133; Mon, 5 May 2025 20:50:27 GMT (envelope-from git) Date: Mon, 5 May 2025 20:50:27 GMT Message-Id: <202505052050.545KoR9R089133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 99c58ad021b2 - main - sctp: compute address flags only for IPv6 addresses 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99c58ad021b2f7dc0496e16d313c5e28a552f0d0 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=99c58ad021b2f7dc0496e16d313c5e28a552f0d0 commit 99c58ad021b2f7dc0496e16d313c5e28a552f0d0 Author: Michael Tuexen AuthorDate: 2025-05-05 20:43:50 +0000 Commit: Michael Tuexen CommitDate: 2025-05-05 20:43:50 +0000 sctp: compute address flags only for IPv6 addresses Only call sctp_gather_internal_ifa_flags() for IPv6 addresses and also compile this code only, when IPv6 is supported. This fixes the compilation of IPv4 only kernels. Reported by: bz@ Fixes: 6ab4b0c0df57 ("sctp: initilize local address flags correctly") MFC after: 3 days --- sys/netinet/sctp_pcb.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 224f9c72d9ae..2092f20e3c22 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -453,7 +453,11 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, SCTPDBG(SCTP_DEBUG_PCB4, "Clearing deleted ifa flag\n"); sctp_ifap->localifa_flags = SCTP_ADDR_VALID; - sctp_gather_internal_ifa_flags(sctp_ifap); +#ifdef INET6 + if (sctp_ifap->address.sa.sa_family == AF_INET6) { + sctp_gather_internal_ifa_flags(sctp_ifap); + } +#endif sctp_ifap->ifn_p = sctp_ifnp; atomic_add_int(&sctp_ifap->ifn_p->refcount, 1); } @@ -476,7 +480,11 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, } else { /* Repair ifn_p, which was NULL... */ sctp_ifap->localifa_flags = SCTP_ADDR_VALID; - sctp_gather_internal_ifa_flags(sctp_ifap); +#ifdef INET6 + if (sctp_ifap->address.sa.sa_family == AF_INET6) { + sctp_gather_internal_ifa_flags(sctp_ifap); + } +#endif SCTPDBG(SCTP_DEBUG_PCB4, "Repairing ifn %p for ifa %p\n", (void *)sctp_ifnp, (void *)sctp_ifap); @@ -501,7 +509,12 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_ifap->ifa = ifa; memcpy(&sctp_ifap->address, addr, addr->sa_len); sctp_ifap->localifa_flags = SCTP_ADDR_VALID | SCTP_ADDR_DEFER_USE; - sctp_gather_internal_ifa_flags(sctp_ifap); + sctp_ifap->flags = ifa_flags; +#ifdef INET6 + if (addr->sa_family == AF_INET6) { + sctp_gather_internal_ifa_flags(sctp_ifap); + } +#endif /* Set scope */ switch (sctp_ifap->address.sa.sa_family) { #ifdef INET