From nobody Tue Apr 15 02:25:30 2025 X-Original-To: dev-commits-src-branches@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 4Zc7L3383Qz5sjbM; Tue, 15 Apr 2025 02:25:31 +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 4Zc7L32DPpz3Lvs; Tue, 15 Apr 2025 02:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744683931; 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=e0WhZMF2wyLeDO+iWTGVjxr5CSdSlncwpe0IetGTg0Q=; b=dgAul/FgmlUV8VQE8hcfN0Pno5vaxGtfNAT2kiA4HHT58qDtPjgfn8icZaysQjmr3HXodm aWXPS35ytRkTg000MQkVoblYLC3L45orYfV4AT/Av8uWVvYHWhYK1w7D9Pc6m/KEIEGWuF /4DPyxW76yz/Wzuy6e6VQiJ93ub4Dru/wKpcmQTbqsJdZM1y4Zi6JS52iJ8HPrmBlXujJJ f3yjuYxBsJh84ZtSERLSA6HKRJNlA4Oqk99fZUT8pP58z2sRBduDJKpiW6WfZD1Ze7AToI dacvkmX+w6B/WojoGNuRlw7eQtXZ359VScZPQFimdx2GBRFtsfabHxrv/l7Olg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744683931; a=rsa-sha256; cv=none; b=Kg3Zcb3hOtWOr8qvD13UXNab44GljRcOBNzF6MWpLwcK3NyLt7Lv/yXjOcOetH7JkQ9N7M VuYUjo/BB17X59wC/RRfDWqqVFA0k38iQ49AClcJshuSM+ntMtFIJB0i+2cf7K9HpquGuh mUYjDBBNDGHs5WhK1i4dC/CTR3JeDO5VRFxQnY7LJEdev8i1271pl/tIc2cfEXDE9YCC5M 5z3dRKLw3KNy1XJdA3aO+tMb0sri/QZQ3+Xj20mKXgyDdx7NrdLKrD1jWuhRnPUdxC89WK nWu7wSUl7qpdCwL+VX1uYuwLBYFKBdqqiMNCSNSCsY2/w+Gy1xXFjFqSxp7wDg== 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=1744683931; 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=e0WhZMF2wyLeDO+iWTGVjxr5CSdSlncwpe0IetGTg0Q=; b=SOM5PtuzEllvskQGt+8c5ea37LDazopCNb7CuziHu+zu6rW8sSRMQ2imqlOgcRoEpsZNyN yTlY6ZDVgyNbpbwRnNAbo701IZiVhqi8CY9+lDy+4PwfPJcTeN5tVA/Ra0J1Fd5dWGELOP KcLErBO9k3ukLD5Z93VRddS8nDEHL5VMv5CoxVDi20OEFZZVTucq5C4VhoFs32pwWnKZfk BMmzTJh8TcR6LPa2I0uHKlJqx8khEHTjWalHP79242sUxG+LBghVJusWIRuf+UQSAnRpV9 7vMorxyhiw16fD6nv9Mln+Y2yHQvzyNUACzdaci2RpoYYWsL+8qHbjdSAzGYrA== 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 4Zc7L31JqCz1Cct; Tue, 15 Apr 2025 02:25:31 +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 53F2PUco014407; Tue, 15 Apr 2025 02:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53F2PUTa014404; Tue, 15 Apr 2025 02:25:30 GMT (envelope-from git) Date: Tue, 15 Apr 2025 02:25:30 GMT Message-Id: <202504150225.53F2PUTa014404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 52465324497a - stable/14 - socket: Handle the possibility of a protocol with no ctloutput List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 52465324497af565076a584280299135ae6cbebd Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=52465324497af565076a584280299135ae6cbebd commit 52465324497af565076a584280299135ae6cbebd Author: Mark Johnston AuthorDate: 2025-03-29 08:55:08 +0000 Commit: Mark Johnston CommitDate: 2025-04-15 02:25:24 +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 (cherry picked from commit 590b45036ee16163f9eb8c34791d197e76de502d) --- 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 22b8a17295ed..221ac19287e0 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -106,6 +106,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) { @@ -210,6 +216,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 7a4e3b1f2507..fffb1d5b9af4 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3793,10 +3793,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: @@ -4004,7 +4001,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: @@ -4055,10 +4052,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 {