The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=1ec3289e481ed004f2820abf9a7d56460459d0f4
commit 1ec3289e481ed004f2820abf9a7d56460459d0f4 Author: Eugene Grosbein <[email protected]> AuthorDate: 2024-09-04 16:32:32 +0000 Commit: Eugene Grosbein <[email protected]> CommitDate: 2024-09-04 16:32:32 +0000 ng_ksocket(4): unbreak after previous commit Fix locking. This is direct commit to stable/13 due to different code base. PR: 272319, 275106 Fixes: 5d0ad5fffbb3b5a71405a47b9b74d7920f9428fd --- sys/netgraph/ng_ksocket.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 1acd9f78efbf..49ea3b1cd1f5 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -954,12 +954,12 @@ ng_ksocket_shutdown(node_p node) solisten_upcall_set(so, NULL, NULL); SOLISTEN_UNLOCK(so); } else { - SOCK_RECVBUF_LOCK(so); - soupcall_clear(so, SO_RCV); - SOCK_RECVBUF_UNLOCK(so); - SOCK_SENDBUF_LOCK(so); - soupcall_clear(so, SO_SND); - SOCK_SENDBUF_UNLOCK(so); + SOCKBUF_LOCK(&priv->so->so_rcv); + soupcall_clear(priv->so, SO_RCV); + SOCKBUF_UNLOCK(&priv->so->so_rcv); + SOCKBUF_LOCK(&priv->so->so_snd); + soupcall_clear(priv->so, SO_SND); + SOCKBUF_UNLOCK(&priv->so->so_snd); } soclose(so); priv->so = NULL;
