From nobody Mon Mar 31 09:06:34 2025 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 4ZR4xk5KJSz5rhk9; Mon, 31 Mar 2025 09:06:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZR4xk2rhcz3YNk; Mon, 31 Mar 2025 09:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743411994; 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=ENCZwrfajdaORctHA48eleSVyOfj+Zl3urdL2O1Rbd4=; b=vljOju7pJmP46F2C7yc9YDp82WL5Sko6DNyTGs8htHnOxNDYmET3eyFJO4C/VSPIqjwIvm ilL05HvPCloItFKxJdewgM7rMNjBmVH4gj6iwHjrLgrwLnR4ltO/jdSm7ny+QGMksfA+h5 5KGX4yrKRRb2uMd4kKNuwlIO9ENm7h1Sdo90PSd0uuenG4ZziG3hnAG3l23u50XVKsoc4N aTrQoREpdaKtjks4LfUaJD8p6AxXwdVxaOjnxIpjfwa1b6h/RxmO2Jss0nx3XNQcJjFFHh PsJl4v0Ux06vzDN+yFjw+u3XdmFdAMhcz0fONQlCjXoSEcV13qWi52QIw8enVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743411994; a=rsa-sha256; cv=none; b=yNTvqEIcLCaUPb28ICRPazhse78dAhvC67OuAPufC0/9zPzerKHrKhfWQQqcp1bjVNosUH +Dx6oYniWOqcT1QZn5QVuUE/2zTbisHpKYIFSHgC1vF8jz5udYds2OURzKZ1+YoV2jCfOq Jf7OJ8suirQkO2mQzM45BsJkN/M4aaQmLBx2kDZuVagpMZ8fFEAGjvmg2nJjs7rAXB/IiE fGxMVX6Uaoiw5Z/uZ6IQbLPsW5zCOesKLUVjmJ2hqD7EQ7N4khURrWDyvyP1VpTlcO9yoH cOnl4PnIchfDxDN8AVUfS7Td90TwUnjTJyFy7JX5nfc7BVzP+L0I1bWIaSOaRw== 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=1743411994; 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=ENCZwrfajdaORctHA48eleSVyOfj+Zl3urdL2O1Rbd4=; b=Dmz7DSsDB75YKyIxVnsS5ht7fNsLI/Q/q8c6Qn43vikpAhhLwRhbEGgiVuYREcviIxLjib wXJclxIqvWBubCz2XXt6Gyfc+TffY5uqq8Iu2UfNTWCXNsPOFFmx2MREPgrZFeAtyoLAVs bOPzcrjQrM2t/AFLlQGuxuTRPR3Mdmms4+H4pinfx58lj+emiseCm3STpW9qCY4nm51JfX nDHVvzK1WwGv8yyaoXbLHTUlIvb6Ny4TIlKB6x/w0kvfH7nko5iaSSaFzo3uTx6ifjJR9c Wv9CGwj+luc1JTDXnBKqSr5O6Zjj/6OfQkzXXmIzgZXnI8+VN/UbzpK9ae3g2Q== 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 4ZR4xk2SQPzdyn; Mon, 31 Mar 2025 09:06:34 +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 52V96Y2E078799; Mon, 31 Mar 2025 09:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52V96YGW078796; Mon, 31 Mar 2025 09:06:34 GMT (envelope-from git) Date: Mon, 31 Mar 2025 09:06:34 GMT Message-Id: <202503310906.52V96YGW078796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 590b45036ee1 - main - socket: Handle the possibility of a protocol with no ctloutput 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 590b45036ee16163f9eb8c34791d197e76de502d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=590b45036ee16163f9eb8c34791d197e76de502d commit 590b45036ee16163f9eb8c34791d197e76de502d Author: Mark Johnston AuthorDate: 2025-03-29 08:55:08 +0000 Commit: Mark Johnston CommitDate: 2025-03-31 09:01:09 +0000 socket: Handle the possibility of a protocol with no ctloutput Add a default ctloutput handler and remove various NULL checks. This fixes a problem wherein the generic SO_SETFIB handler did not check whether the protocol has a ctloutput implementation before calling the function pointer. Reported by: syzkaller Reviewed by: glebius Fixes: caccbaef8e26 ("socket: Move SO_SETFIB handling to protocol layers") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49436 --- sys/kern/uipc_domain.c | 7 +++++++ sys/kern/uipc_socket.c | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 51e0f8cc7726..2d68e11b9f0a 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -97,6 +97,12 @@ pr_control_notsupp(struct socket *so, u_long cmd, void *data, return (EOPNOTSUPP); } +static int +pr_ctloutput_notsupp(struct socket *so, struct sockopt *sopt) +{ + return (ENOPROTOOPT); +} + static int pr_disconnect_notsupp(struct socket *so) { @@ -194,6 +200,7 @@ pr_init(struct domain *dom, struct protosw *pr) NOTSUPP(pr_connect2); NOTSUPP(pr_connectat); NOTSUPP(pr_control); + NOTSUPP(pr_ctloutput); NOTSUPP(pr_disconnect); NOTSUPP(pr_listen); NOTSUPP(pr_peeraddr); diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 63d30f04c8e0..ac00696236a5 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3804,10 +3804,7 @@ sosetopt(struct socket *so, struct sockopt *sopt) CURVNET_SET(so->so_vnet); error = 0; if (sopt->sopt_level != SOL_SOCKET) { - if (so->so_proto->pr_ctloutput != NULL) - error = (*so->so_proto->pr_ctloutput)(so, sopt); - else - error = ENOPROTOOPT; + error = (*so->so_proto->pr_ctloutput)(so, sopt); } else { switch (sopt->sopt_name) { case SO_ACCEPTFILTER: @@ -4017,7 +4014,7 @@ sosetopt(struct socket *so, struct sockopt *sopt) error = ENOPROTOOPT; break; } - if (error == 0 && so->so_proto->pr_ctloutput != NULL) + if (error == 0) (void)(*so->so_proto->pr_ctloutput)(so, sopt); } bad: @@ -4068,10 +4065,7 @@ sogetopt(struct socket *so, struct sockopt *sopt) CURVNET_SET(so->so_vnet); error = 0; if (sopt->sopt_level != SOL_SOCKET) { - if (so->so_proto->pr_ctloutput != NULL) - error = (*so->so_proto->pr_ctloutput)(so, sopt); - else - error = ENOPROTOOPT; + error = (*so->so_proto->pr_ctloutput)(so, sopt); CURVNET_RESTORE(); return (error); } else {