From nobody Mon May 09 17:55:09 2022 X-Original-To: dev-commits-src-main@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 E3BFF1AD8D05; Mon, 9 May 2022 17:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KxpjT2vzVz4sn1; Mon, 9 May 2022 17:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652118909; 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=n8knZ0BywnhCV+kzwMrUIbYJO7bNg/KobVnNMR7dT70=; b=Mz1h5e5icp7KUVc5KbxJZWRITfYGk3byz/4l4YG3kkAsbcDSRsI1lwsITKTQmz1Hs1e5nr GAeBH7NEP1Y1X6Pps/VHX94VEXPzur+iVIyYGvX5yqDzfxsa7K8QLb1l2LR3+ZcJioEPzD FRENiC7NnuZWAOzS1sn1u6iclkbIKTv+Zm9zIL+HpEoCmRzFE63W4VSjzaxlHbjBuSE7OP Hj6gwidP1InSupttI9adUgw0isNqlNZfGrilucyPzuTyQmosEeQTGPXA2DkWmJ056+ujmS Rh79lXhQssMvUuYKGuSpPvZaccyNrmEINCdHKlwq03HxVeTDWhEehNdEc2YM7g== 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 2A14E1581E; Mon, 9 May 2022 17:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 249Ht9bj061155; Mon, 9 May 2022 17:55:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249Ht9EM061154; Mon, 9 May 2022 17:55:09 GMT (envelope-from git) Date: Mon, 9 May 2022 17:55:09 GMT Message-Id: <202205091755.249Ht9EM061154@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: c17418a0ba6e - main - sockets: assert that any protocol with PR_RIGHTS has dom_dispose() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c17418a0ba6eef8d2070d75844f9ede4ddbc413b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652118909; 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=n8knZ0BywnhCV+kzwMrUIbYJO7bNg/KobVnNMR7dT70=; b=miPHEDurl4xQkNQmWsz80h3fN9XZMqPGmmhQ5onq6rBsiorcuONFaJrf1RjU/eF5y6SgOa 2lfnbfQxHDUZJhPLiGcPJyNd5ZgTd0SvGsnwx2smM8KRBaTTXZuc17e0+PluOyGKNJgNXQ VPMqk0PDMT/gDEmw1EEu2cdufQTnRWpdsdFRyrEc/pHOAfG0ryRAf9ZLV1WerQLBVFg75t KnewWxPyKpsTNSx3FdUKGtDiyAeAurGhZjiSiH4ToC6FTEQdtBVsxy3oW14HBxkGGLRvQq VxKjqf9irL3MUNWE29B1sEXDkzQ50fVpcAAyqKNf0VsUniV+rTL8qzcA2jsTMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652118909; a=rsa-sha256; cv=none; b=ajQlC4Omjnq74HOPbyMT7qAmfQgQptMvHNEmAiGyeWFJUE53IcETZzYpEKew8AZ8mJDQ8I iMeIgnf04xUXJ19A2uaXKQ+C5Q4Fyd/96krLEbAnk4rS8L6fQ7GjTfgkCyuxEFZ1wlcYKO 8DIUjh1Q1xhBT14QRBe/Kn8q/jmh5DVYPHQoCo16mzsuWjEEs8Gy5ReqeX8ZI+5kLRu0yz CW2JVk+5QFKyrs8IAp0PbyiIxJQVSsvdyGrkDsbOHBSa3cE+mYsAWxvZHa0+ngcITwn9HU bWy/AmasnV/bzCTstlkx2imOuKLoY1l8sM38g3vBstvF+sbP2cJBKZFlIjMVUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c17418a0ba6eef8d2070d75844f9ede4ddbc413b commit c17418a0ba6eef8d2070d75844f9ede4ddbc413b Author: Gleb Smirnoff AuthorDate: 2022-05-09 17:42:48 +0000 Commit: Gleb Smirnoff CommitDate: 2022-05-09 17:42:48 +0000 sockets: assert that any protocol with PR_RIGHTS has dom_dispose() Through the entire history only PF_UNIX has this feature. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D35123 --- sys/kern/uipc_socket.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index f33814efd176..029f7c8387ca 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1195,8 +1195,10 @@ sofree(struct socket *so) so->so_dtor(so); VNET_SO_ASSERT(so); - if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL) + if (pr->pr_flags & PR_RIGHTS) { + MPASS(pr->pr_domain->dom_dispose != NULL); (*pr->pr_domain->dom_dispose)(so); + } if (pr->pr_usrreqs->pru_detach != NULL) (*pr->pr_usrreqs->pru_detach)(so); @@ -2989,8 +2991,10 @@ sorflush(struct socket *so) * any unsafe routines (that rely on locks being initialized) on aso. */ pr = so->so_proto; - if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL) + if (pr->pr_flags & PR_RIGHTS) { + MPASS(pr->pr_domain->dom_dispose != NULL); (*pr->pr_domain->dom_dispose)(&aso); + } sbrelease_internal(&aso.so_rcv, so); }