From nobody Wed Sep 04 16:35:20 2024 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 4WzSlX3tCpz5VCkT; Wed, 04 Sep 2024 16:35:20 +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 4WzSlX3Lblz4jKr; Wed, 4 Sep 2024 16:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725467720; 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=rT0fo+7HXisVijoc3JJBzHlYX48alk/qrC4+1QkqQDM=; b=uOKYKBlSJU7mSMazSaoaerC9+N+O4wGU6s1qcxfj39++kOad4KfZaGDVjM2pdiRs9I5Dl6 wD9Tt0UaU/aam0V+rZqBAA3Zb3648K3XCkNg+mD9tIHOAj0pkXRgQA3qJwvDwCvw6qh8Ut enJVC1QTovAc7xVpCIC32KjGMUctCXCZUwJQUoyUpUcqudt8WLERJZk2zBX6vBwv9npSoh YqD1XhW5yKpv1Gek1J5hnFvWDKOHzf+UIKCQPkigjLEtZpQHR9RLB72AFVf829X08LRMdl iYeafdy3n+NbRu65MfkmnGQnB9i+B+4/WDLl2YgqLQ7Vv+nSYxuvkdHRhUAVnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725467720; a=rsa-sha256; cv=none; b=lvly6DmogeDxHS0sspzxbH5ItQ+4bn/X0VthgAwtjs4XCuQT8vMrBJJ50N3DAQlSWrJE9G 92p9plJbvEM66K55pFTDJvUsEgQlXL04MztDyJau0yer48hlBzag7UX4aeRMUQIDTblEKL MywlrFgrPPpHECmi7a2aK8XqpF+G9yGtfPwp/jqoQfQ0IGhRMmq7XgE4IBwBlYKkWYHOML w1ubZo/uRzQMEPZb2FDn3G65ZAQZmpPIu0HVH8AoLqJpsdpAnowx7rXwIJLlMMzZ0G6ZmV JUSdlFEIgzbm+jvMjf77nlKd5tq4C8Hf6gx/LlqjjKGvA62bJ9A0rxCxP3I2rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725467720; 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=rT0fo+7HXisVijoc3JJBzHlYX48alk/qrC4+1QkqQDM=; b=NYYlOeL2xtXSCYMO9t0gwCnL+vQPLv0B4WQwLGTMcbQYXtgElXsFPwoc9MddACatSAjwbY gZqgkBRuBZwxf0Uh0ESZumLgJzexlHlGHxnLB3Pp0aYzWaqW+xZrnK4TMwKjMnTdbf1CX2 I0UXzXWB+obU1bwMK/d6bhzniOoRzVoljd10ZT89S381saUO+dDCPHiyTDiUPdN3aWJYrG jO/OK18M4imCl8Sm3IrrGW4H5D/eJTDOzQ31Y1ITElZ4iy1kO0oHF1eJDIDg/9TOsyc9V5 XCwimkiZccLYh1JAy/vCVb08Sjr3jWkZolgRsafYM9GXsUeHTxZNYjW4ZG+/cw== 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 4WzSlX2ycHzY2G; Wed, 4 Sep 2024 16:35:20 +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 484GZKhE089599; Wed, 4 Sep 2024 16:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484GZKEe089596; Wed, 4 Sep 2024 16:35:20 GMT (envelope-from git) Date: Wed, 4 Sep 2024 16:35:20 GMT Message-Id: <202409041635.484GZKEe089596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 1ec3289e481e - stable/13 - ng_ksocket(4): unbreak after previous commit 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1ec3289e481ed004f2820abf9a7d56460459d0f4 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=1ec3289e481ed004f2820abf9a7d56460459d0f4 commit 1ec3289e481ed004f2820abf9a7d56460459d0f4 Author: Eugene Grosbein AuthorDate: 2024-09-04 16:32:32 +0000 Commit: Eugene Grosbein 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;