From nobody Fri Jun 20 22:36:17 2025 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 4bPC4d5Wzxz5ydc5; Fri, 20 Jun 2025 22:36:17 +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 4bPC4d49D1z47C9; Fri, 20 Jun 2025 22:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750458977; 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=NoC7R8bziQmYrgxM6tvi39xBfw3KEknO8t9SoOzKHEQ=; b=i/sTUZCu0EVpCCDAoAjs590Mxsu0Htz5LrPseDjSsZI1t4svWLnLj9Tm1JdUN232ljMDg+ yhk8RIVKulsEwLIgKwVUNr7Pv4iHAQ9mVUjXgP17oby2ZXPKjhPHMGwPOCN8sO+ROZ7EhW yznK84DtL2Kk3iqzW34vqjqdxZDCKT5QdB+FYd96bBEiw9t9aHfrzflyYqQkfX4aKCabmk m9WoFL11edp5kwxc8Rd19c1o13msRXPYYt36aqFabXjtqQpR+NJMN/kgu1KeDczDEE7YoM PZhQckRBJ6YdcXjye+XS/DdgdCWhOVGTv4ggcrw0f93Np3e3FWfOcHryNWMJFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750458977; 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=NoC7R8bziQmYrgxM6tvi39xBfw3KEknO8t9SoOzKHEQ=; b=bRSyK7ft7NdwUAy5MFiGJweTPCVU0ftpFn9UWDDCLVvotEsYtpkoLbPHxICToDmGgqu7ww G+vxbMSEbLat75AJOkQ05QnpBSJwkgYW5PZM/ornBlNTwwei5kCcl3IjkgC/jjOKP1u5Ax jjT3W+Kurdxvja4DEy/ylnouA70LgQXgtNi5ZAyfnhBqYja8lCQkVvKqNyRWwjD78+tFoo l9IezlcPOduDg8WfweI/yv14/pKaIj/RTa1HfAkMJvFxPksyiU/ADdFLI/jj/9yrpSJJD6 sH0Se+f/Lx8OGKNqQC/GStb1SBZj1Nn9kUnuDokzIdovefHz7h4G3zd5QFWGUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750458977; a=rsa-sha256; cv=none; b=m/F5QG2xLzhJzXHUHVgmAuYhbGYMd6gdHEgOwBgUcWHz/GtGcxLLv6b9z89ksxSIDCyB9i zOnQhVQQkC/puh0VtGz4MlnGyZM2KEu6pjLlxAENn6eA02IlHDdv/zvQDkrsdf7S1QYubM CvcjD2cQ+/Srgg4Vb95+tXGh/DXX0ebb4iCc9dTCRBCLA83TDqUnPb3hkHdA9xjGGAsKus HxaMD8ypFMPWcORzxmy0HzS/33iedaFBUXhUj1tsNmVQaKUhujJiFafVRdeZXIKY3jwi/c NU1JqgougzyVZ06IW5w5wutZc7bcx2qg4J2k8bNpKO8JCJCBmQ9v/23sZxpb4g== 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 4bPC4d3ZJZz14Hc; Fri, 20 Jun 2025 22:36:17 +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 55KMaH9R039095; Fri, 20 Jun 2025 22:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KMaHOB039092; Fri, 20 Jun 2025 22:36:17 GMT (envelope-from git) Date: Fri, 20 Jun 2025 22:36:17 GMT Message-Id: <202506202236.55KMaHOB039092@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: 2fcbd5a75b5a - main - netgraph/ksocket tests: Bind to a specific address 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 2fcbd5a75b5adea9830b6688f3ae529bdfbc28f0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2fcbd5a75b5adea9830b6688f3ae529bdfbc28f0 commit 2fcbd5a75b5adea9830b6688f3ae529bdfbc28f0 Author: Mark Johnston AuthorDate: 2025-06-20 22:33:42 +0000 Commit: Mark Johnston CommitDate: 2025-06-20 22:35:38 +0000 netgraph/ksocket tests: Bind to a specific address Otherwise we rely on connect(INADDR_ANY) connecting to a socket bound to an arbitrary host address, but as of commit cd240957d7ba this is disallowed by default. Reported by: Siva Mahadevan Fixes: cd240957d7ba ("netinet: Disallow connections to INADDR_ANY") --- tests/sys/netgraph/ksocket.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/sys/netgraph/ksocket.c b/tests/sys/netgraph/ksocket.c index e97b9b3f0691..d3ea5ca2876e 100644 --- a/tests/sys/netgraph/ksocket.c +++ b/tests/sys/netgraph/ksocket.c @@ -50,15 +50,17 @@ hellocheck(int wr, int rd) ATF_TC_WITHOUT_HEAD(udp_connect); ATF_TC_BODY(udp_connect, tc) { - struct sockaddr sa = { - .sa_family = AF_INET, + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + .sin_len = sizeof(sin), }; - socklen_t slen = sizeof(sa); + socklen_t slen = sizeof(sin); int ds, cs, us; ATF_REQUIRE((us = socket(PF_INET, SOCK_DGRAM, 0)) > 0); - ATF_REQUIRE(bind(us, &sa, sizeof(sa)) == 0); - ATF_REQUIRE(getsockname(us, &sa, &slen) == 0); + ATF_REQUIRE(bind(us, (struct sockaddr *)&sin, sizeof(sin)) == 0); + ATF_REQUIRE(getsockname(us, (struct sockaddr *)&sin, &slen) == 0); struct ngm_mkpeer mkp = { .type = NG_KSOCKET_NODE_TYPE, @@ -69,7 +71,7 @@ ATF_TC_BODY(udp_connect, tc) ATF_REQUIRE(NgSendMsg(cs, ".", NGM_GENERIC_COOKIE, NGM_MKPEER, &mkp, sizeof(mkp)) >= 0); ATF_REQUIRE(NgSendMsg(cs, ".:" OURHOOK, NGM_KSOCKET_COOKIE, - NGM_KSOCKET_CONNECT, &sa, sizeof(sa)) >= 0); + NGM_KSOCKET_CONNECT, &sin, sizeof(sin)) >= 0); hellocheck(ds, us); } @@ -79,6 +81,7 @@ ATF_TC_BODY(udp_bind, tc) { struct sockaddr_in sin = { .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), .sin_len = sizeof(sin), }; struct ng_mesg *rep;