From nobody Wed May 21 17:12:02 2025 X-Original-To: dev-commits-src-branches@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 4b2dJL2vyjz5wDh8; Wed, 21 May 2025 17:12:02 +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 4b2dJL1TyCz3l7p; Wed, 21 May 2025 17:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847522; 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=5HyJYUJVeQoP3XJcDTTg4h29hiSLLUe7cbFIFgUUd8k=; b=jFBi/3cKr2HWJqOmqxBYAzkQsoadhVkRn8fgNpLljPF3JwUoMu4if5fVhjoFSQZ7HI0lPh 6Ml8LXAQ2S0EHrr1kPW5DrNh7CdkcsNJc5Q0BCFXkVcRfiHCgWqz/WmtuoRbsegefMuivn /cQWnzxi0R2XplWlhPotXyF31Rhc8NWK+G58fy8ujwcMDf69dweDhmdHwInQsCpEXynuib /G4lqqZCYNHY4ElNXv49JmCE3l8oilRr/II99w8PjwNtE9SXcFczxp7Kl8NeUZ4QrRShzj Bs+zNmjnf5ag59J8H8ETrLRIonj9+ulzx4iEpbQ+qh7Xwssdyxt1mzX4sOzpkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847522; 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=5HyJYUJVeQoP3XJcDTTg4h29hiSLLUe7cbFIFgUUd8k=; b=goroG/mEK/dK+39fDyqCg8RlwJ7UBzgoaQKv2OksvdGQf0KJ0ZgJuteQPZWkadPCHTrinM I94d3ymbz4UDMWeqHS2PA8HU//CVYEgMcXMdF5q5hNNMFfJb+vsNoLB9ELX9KMpPrF9hEV DKQDFhDxtrhVetUBHs2GgvPyqQBh6uTMv0Y5FtSvZeJid8PQvs52G5NnPeCP6/ly1106GN OQqfjVjHjr6i9uR1DzreX1vG5qOSaH7qxQDGEjot4mO9hscQ4DmmdEDMS3anXtV3g+itMG WTnTXNNZ/rMOHxfxrmGiziD2YuLzjxRh5BtGq0Ipa+hh2Wy9evPghi+9n8h+OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747847522; a=rsa-sha256; cv=none; b=Q2zAOwXZRZgk/b9X9DnnzVFdnycsv5asg9yIAhbagMvczkitqUa2rZJe+7dIVhPxlJpBmD FePWkW1P7RKGFFVardwQFbqGzV2dup/WTG9o2bb2zonc32zL8mEspAHBOvKnkOqbI4P4/V iqUJfqgi5u+sWkGW3fUSZQBLtX7NNMPMO2EE8Ay946D/6ksD1uKwnfnVAQiaVSExlbYN9n 0tU7KD02T2RHQJoFjQdgTdWUkO9xBDdD7KIlfvNr+rxnfQd6SwGLClUnNs5jSQDFUlXOw+ PJg/ZnJVrJbWk0uK55laqKW+GeKc2C9O3ElEJUBS1+H54JSqj531rOOCp4L+Vw== 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 4b2dJL0x5vzkjq; Wed, 21 May 2025 17:12:02 +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 54LHC2vv012200; Wed, 21 May 2025 17:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LHC2t9012197; Wed, 21 May 2025 17:12:02 GMT (envelope-from git) Date: Wed, 21 May 2025 17:12:02 GMT Message-Id: <202505211712.54LHC2t9012197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 5d4ef780ea9f - stable/14 - sctp: compute address flags only for IPv6 addresses List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5d4ef780ea9f81b6b5bdd23b9f442eae8c481edb Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5d4ef780ea9f81b6b5bdd23b9f442eae8c481edb commit 5d4ef780ea9f81b6b5bdd23b9f442eae8c481edb Author: Michael Tuexen AuthorDate: 2025-05-05 20:43:50 +0000 Commit: Michael Tuexen CommitDate: 2025-05-21 17:11:43 +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") (cherry picked from commit 99c58ad021b2f7dc0496e16d313c5e28a552f0d0) --- 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 44807733b9e9..b5190bdf34d8 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