From nobody Wed Nov 06 10:11:09 2024 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 4Xk1F920xdz5cP3Z; Wed, 06 Nov 2024 10:11:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk1F91Swyz4cQv; Wed, 6 Nov 2024 10:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730887869; 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=aP35qmTVlLVBZPunjNIb19/MtByX42RIjLPuHR80mRE=; b=ohEoR2kdQqdcCo2j9JYwm+uakb7STjLpaTRJv4Mj8uZxsrTSiBz/hhIta1tw3mcAt34W+j lfL9Tn7d5474/LEFHaxWhV3g+KyIoBg7Dy2A321taIdFLf9ctbGOmu2RyE5bPszviFIG3B IkrPqC8uB0JByua6KoTKNGANHo2lj7yoS/yOv9YrdZegXuVcVAdJmQZ4pW3A49xmB3T6Od bQInEdU4rWSDxXDF6PUTYNMAsAuX/0X7kXBUwfz+DMbLmtzqnxBljAwp4YOFFeQ0sKHuTp /Njsd37Q7DGFsdkilDCUcgNq2Ug681x/NBxpSzrZhJqcjPb+44JsT1lAS6lh1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730887869; 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=aP35qmTVlLVBZPunjNIb19/MtByX42RIjLPuHR80mRE=; b=Q/OKxIrMcBmPRG//Z59u4a73xquCDyXwhJ3KqGdthyRVEsxkPriXLXRIWXr4FQaML8zQFG Ay7qV9nfi4tA5AUt6fZ935LxuRLjoDarwyerNWQfqaryjw8ss8Usvp6mCSKSq69l7sIPiQ uAkIZH/XRPMtccHNj2rRBdKSkt8RXBEkJcUY6qX1VZGURPLM5ps9eyjsXL35U+kV6uYL71 75DHooJXs77eoRCIVeB3P+S5N0g5NWfbZ4bRm5wq+d23T+YvQJq6rlp6on6lOIkiyzW9Rd /0ltJTmTZCkA1YAg5ZdmFNvpjxxWYnOWJ6QnGRAmp3G27dXYHM6gCLl21wSYSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730887869; a=rsa-sha256; cv=none; b=IdINSVAUglMlI8QlDZwzDTGfjX3EjwwTPpmJ+ev0anzCrgHt8i2UJfv1/QNFxG4M76bQI+ m4duZhtymbPU8FA6G1UpDo1fVCABTCbg65niz7dA83fCbQIKe4HK28OTqctoSwhH285oIs NsLQ6K8w0O7+msggwn/26wz9kPyVzc/6Tb56XSrEZvSiIZidCeWXbYAgb9XuQcnEZRYfGr BJO2GLuC0icEvCRNKu1fFYO+L85P6lr+KJQsVMSgha4M6yZPqy82pZ2N0dY1DbK2g0cX5E nD8P9B6X+2RUu1fsLA/+9Xps5S6v0ezp5V01m32pvRnlEP9OOJbzKxKy+UlTpg== 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 4Xk1F90rtNzxTx; Wed, 6 Nov 2024 10:11:09 +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 4A6AB9U1075477; Wed, 6 Nov 2024 10:11:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6AB9DK075474; Wed, 6 Nov 2024 10:11:09 GMT (envelope-from git) Date: Wed, 6 Nov 2024 10:11:09 GMT Message-Id: <202411061011.4A6AB9DK075474@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: 7fe14d4bb8c0 - stable/14 - sctp: don't consider the interface name when removing an address 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: 7fe14d4bb8c01c9d5f25cd476a3354053569a221 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7fe14d4bb8c01c9d5f25cd476a3354053569a221 commit 7fe14d4bb8c01c9d5f25cd476a3354053569a221 Author: Michael Tuexen AuthorDate: 2024-11-02 15:33:02 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 09:10:56 +0000 sctp: don't consider the interface name when removing an address Checking the interface name can not be done consistently, so don't do it. (cherry picked from commit bf11fdaf0d095fecca61fa8b457d06e27fae5946) --- sys/netinet/sctp_bsd_addr.c | 3 +-- sys/netinet/sctp_pcb.c | 27 +++------------------------ sys/netinet/sctp_pcb.h | 2 +- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index a91b0dde5967..3c6952ab6f3c 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -338,8 +338,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd) (void *)ifa, ifa->ifa_addr, ifa_flags, 1); } else { sctp_del_addr_from_vrf(SCTP_DEFAULT_VRFID, ifa->ifa_addr, - ifa->ifa_ifp->if_index, - ifa->ifa_ifp->if_xname); + ifa->ifa_ifp->if_index); /* * We don't bump refcount here so when it completes the diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index b7b531ab33ab..cd5479c11e6a 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -662,8 +662,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, */ SCTPDBG(SCTP_DEBUG_PCB4, "Lost an address change?\n"); /* Opps, must decrement the count */ - sctp_del_addr_from_vrf(vrf_id, addr, ifn_index, - if_name); + sctp_del_addr_from_vrf(vrf_id, addr, ifn_index); return (NULL); } SCTP_INCR_LADDR_COUNT(); @@ -688,7 +687,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, void sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, - uint32_t ifn_index, const char *if_name) + uint32_t ifn_index) { struct sctp_vrf *vrf; struct sctp_ifa *sctp_ifap; @@ -709,27 +708,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap != NULL) { /* Validate the delete */ if (sctp_ifap->ifn_p) { - bool valid = false; - - /*- - * The name has priority over the ifn_index - * if its given. - */ - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) { - /* They match its a correct delete */ - valid = true; - } - } - if (!valid) { - /* last ditch check ifn_index */ - if (ifn_index == sctp_ifap->ifn_p->ifn_index) { - valid = true; - } - } - if (!valid) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s does not match addresses\n", - ifn_index, ((if_name == NULL) ? "NULL" : if_name)); + if (ifn_index != sctp_ifap->ifn_p->ifn_index) { SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s - ignoring delete\n", sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_name); SCTP_IPI_ADDR_WUNLOCK(); diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 86c244c71544..1249c2233c63 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -510,7 +510,7 @@ void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void sctp_del_addr_from_vrf(uint32_t vrfid, struct sockaddr *addr, - uint32_t ifn_index, const char *if_name); + uint32_t ifn_index); struct sctp_nets *sctp_findnet(struct sctp_tcb *, struct sockaddr *);