git: bbb73d8941d4 - stable/14 - sctp: check locking requirements
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 31 Oct 2024 14:01:52 UTC
The branch stable/14 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=bbb73d8941d4ccbbf8b97677556f6485a8e3845b
commit bbb73d8941d4ccbbf8b97677556f6485a8e3845b
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-10-10 13:50:41 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-10-31 11:40:21 +0000
sctp: check locking requirements
Actually assert the locking instead of describing it in a comment.
No functional change intended.
(cherry picked from commit 4466a97e83fd9484cb22dd2867b6972f6b185e8b)
---
sys/netinet/sctp_pcb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index f89865456274..a0f323043d9b 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -378,13 +378,13 @@ out:
/*-
* Add an ifa to an ifn.
* Register the interface as necessary.
- * NOTE: ADDR write lock MUST be held.
*/
static void
sctp_add_ifa_to_ifn(struct sctp_ifn *sctp_ifnp, struct sctp_ifa *sctp_ifap)
{
int ifa_af;
+ SCTP_IPI_ADDR_WLOCK_ASSERT();
LIST_INSERT_HEAD(&sctp_ifnp->ifalist, sctp_ifap, next_ifa);
sctp_ifap->ifn_p = sctp_ifnp;
atomic_add_int(&sctp_ifap->ifn_p->refcount, 1);
@@ -415,11 +415,11 @@ sctp_add_ifa_to_ifn(struct sctp_ifn *sctp_ifnp, struct sctp_ifa *sctp_ifap)
* Remove an ifa from its ifn.
* If no more addresses exist, remove the ifn too. Otherwise, re-register
* the interface based on the remaining address families left.
- * NOTE: ADDR write lock MUST be held.
*/
static void
sctp_remove_ifa_from_ifn(struct sctp_ifa *sctp_ifap)
{
+ SCTP_IPI_ADDR_WLOCK_ASSERT();
LIST_REMOVE(sctp_ifap, next_ifa);
if (sctp_ifap->ifn_p) {
/* update address counts */