From nobody Tue Jan 9 01:21:06 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 4T8Cmy66kNz55VJs; Tue, 9 Jan 2024 01:21:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T8Cmy4Sz2z4Mqb; Tue, 9 Jan 2024 01:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704763266; 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=de5hE8J7ixn1ZE9+4Jd8EcdUT3/QgXvGDrtSc1B0M/k=; b=lVWwhM/zybYTcCNRdeCL+ylErRMmaZXThlJAUr97zcRzka4KnPmv9OUaD/2wgRNiGUcjjx rL0uBv4Oy8vK2qKgbQdf7Ol5GynhVdQihMes9Dhf+u3FNjdQuH9mav1kEe7ohY5zR3toX7 SuMUvX9erVbbworJZrL2fAgxrEWsQTa//TnfApVzVIYctPfop8maD+QUCdUh6VyOSq/fs8 MDGi6RFdPGrIGcZnhP7A+Mg6byazLJXfkJUo/Z0cSCI1m/WU8CQB02l4TET1CGVQLvnfcN o5R6xCo31yVQWyijIX668r4+1qAGRBaDCMg4WJuRU4RJAMmrQSqHzOyHxsLKmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704763266; 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=de5hE8J7ixn1ZE9+4Jd8EcdUT3/QgXvGDrtSc1B0M/k=; b=Z3/jDW8wDAWYV3Xgcu/3KZRiytnK2FDggzU0/IbXeNkuauRZ7rBpSril4OUj4K7Jyx49JS 2KLQogBEJojLTsP0nErUL2L/zGKAi9TbKxE10fap8nQTvOaIYkYBsBdSrXKwUJMAFEvjuc 4Ow6mVpmaAo6OU5JEuwBlORdt79LsSxeHJrkiRjVzFxJJE0/4RMDmFfCRMTrNtFIjLz1kT lxPSkfRvYSdnTei4J3cDiV2d8i49z8cSq/Vovx7NR480un+jiFxdvJmxdDnZUrue3ciDL5 qGh8mN3oOCJjEE8aBqa+R2uVwp/71+QlOSkeWkC/wNZjnW1iu6+LffiOF2Z8pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704763266; a=rsa-sha256; cv=none; b=YRfme55sPnJPV86fmIxWpFTQt1UweLp/AhiVmH9fIIvR8cO7pe7xtcx2hlws4kXebtxGtX JZVIioRcnBCe2dvkQPPK+5HUbRD9ZxQS++o7OrhjOAdqacjL8w4mS2S49xIxze9I23sH1u /fhhxy1vltCmmifld7kc+eLMcv99WeQsm90wNPse3Pfoq3DubosYSFafw1vsVqE/4+qA8a B0+epW7jJz/6fFAwaRK0//zYTQdENoadJyaN+n+cgvMAHoSolwr6NSqwQ+fHvO+39TU547 c9Jcc2CKT5vMDf1T65yut5swg+YzOijvlJlzFj/NdXoi/zsbGGnGClKZqgBsRg== 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 4T8Cmy3ZvwzWmg; Tue, 9 Jan 2024 01:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4091L6Ds009455; Tue, 9 Jan 2024 01:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4091L6Gn009452; Tue, 9 Jan 2024 01:21:06 GMT (envelope-from git) Date: Tue, 9 Jan 2024 01:21:06 GMT Message-Id: <202401090121.4091L6Gn009452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 59ce044a7856 - main - sockets: on shutdown(2) do sorflush() only in case of generic sockbuf 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59ce044a7856b16803f7eb0aa5c54cfe6e13cff7 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=59ce044a7856b16803f7eb0aa5c54cfe6e13cff7 commit 59ce044a7856b16803f7eb0aa5c54cfe6e13cff7 Author: Gleb Smirnoff AuthorDate: 2024-01-09 01:20:31 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-09 01:20:31 +0000 sockets: on shutdown(2) do sorflush() only in case of generic sockbuf This is a quick plug to fix panic with Netlink which has protocol specific buffers. Note that PF_UNIX/SOCK_DGRAM, which also has its own buffers, avoids the panic due to being SOCK_DGRAM. A correct but more complicated fix that needs to be done is to merge pr_shutdown, pr_flush and dom_dispose into one protocol method that may call sorflush for generic sockets or do their own stuff for protocol which has own buffers. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D43367 Reported-by: syzbot+a58e1615881c01a51653@syzkaller.appspotmail.com --- sys/kern/uipc_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index efa349d140ff..3409a7085df6 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3007,7 +3007,7 @@ soshutdown(struct socket *so, int how) pr = so->so_proto; if (pr->pr_flush != NULL) pr->pr_flush(so, how); - if (how != SHUT_WR) + if (how != SHUT_WR && !(pr->pr_flags & PR_SOCKBUF)) sorflush(so); if (how != SHUT_RD) { error = pr->pr_shutdown(so);