From nobody Wed Apr 16 18:02:51 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 4Zd8576BQhz5t1tY; Wed, 16 Apr 2025 18:02:51 +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 4Zd8574ydsz3RDn; Wed, 16 Apr 2025 18:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744826571; 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=u8/aqEK5bIJvjKluDSdyU12zXq0WyWHVvqqknvCU6qo=; b=IgVYt6RNmQimfC8EZI+bvLTdOcCkQStTrVjYEyGeTt4omU4qfS9wAQhKINfdxEefBFhjMU cVtqT5J7En42kuajxMUfypRE5AJUUTHAcpP+Bm/FGXBM6Jep99R1eaS6Vn083fjgO8bFYt IbtnWe9PLIhDTzrZPrineH2FIuKTktm/LOX5x8NWD3u+Myt6EM3OK9Rie5iEVSCwqRvamK NuyMC+galGTw9h2uS1JqZngJ5qOpBW2vNuUSX9RGeDqGUg1AWe7vRWp5dmc+2H6BHu25yl kTxDyGFeqRGzFlcDbBSPEO0eX/7TyqFLnwQdHWLSWLjI1eGJ/OZiyx18XIwJGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744826571; a=rsa-sha256; cv=none; b=VbSuOnxKYDuDEFGiuhQLCYQOasLjqWeGt7eY4T7pCIxZwLgE/Cm9bk9gcF0IOcm6h7K3G3 BB/ICw1N8rlsIxb+BjrO1LENeiSdw99si+MhvtQHJEMIWrJ9RN/8SLOG3vFmNF1imoTySm 55nCYrD4Lp8U1C4c1RrergNfRXLA1BvkjNG2rTpw3J79ResXMATtKdGkY8ydRTvt3Gu6qi oVr0jUCjQAcsrn6G7cpZ10RTi7zx9wpLImE5e15LCcyYUaHp2rVMoStHDM4GZ9Xo8zSPFV oML5oq4k6mIfwQfDjpgNy4Rjz3O6y/o/3V3+HPURNPQPFOEx7x0D5hyDIhU7fw== 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=1744826571; 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=u8/aqEK5bIJvjKluDSdyU12zXq0WyWHVvqqknvCU6qo=; b=RHplKnguZ+NLkDdFnQ8lF0DuZwwjAiy93l1UOPI+YoT+A5pWIaAYqwtglxqXdwAFsCLINJ wDr0/7Dn3t+ECIU573YyYcmSSFQgbFQM43od2Yhao7I9TFPdcCgpd7+aVJ4c9ADRePX2BN uHsMmApz6bFnduGq/hkbJh5HzefdVAE/ZyF58mO5KRsqF++37hDbX5irzbwvGUwuTCfJu3 XiQQvZZXEVFZEEInNsB5/CMy3mYToo0RnJE/c85BLZsg2Q3HV2nQbW+XuysJpLrWtvEVrU me7/x9k4atFZQh+GkH4eJlTCV/Wv0tP4Hhc9IjwJcKR6/AdOfxfvGVd54VhPfA== 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 4Zd8574WsNz1RpY; Wed, 16 Apr 2025 18:02:51 +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 53GI2p2o075713; Wed, 16 Apr 2025 18:02:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53GI2pbd075710; Wed, 16 Apr 2025 18:02:51 GMT (envelope-from git) Date: Wed, 16 Apr 2025 18:02:51 GMT Message-Id: <202504161802.53GI2pbd075710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a6a98453d8c9 - main - pf: Don't convert arc4random() to host byte order 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6a98453d8c9169a0859c48e2893df3f6ffe84cf Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a6a98453d8c9169a0859c48e2893df3f6ffe84cf commit a6a98453d8c9169a0859c48e2893df3f6ffe84cf Author: Kristof Provost AuthorDate: 2025-04-15 15:29:17 +0000 Commit: Kristof Provost CommitDate: 2025-04-16 14:23:47 +0000 pf: Don't convert arc4random() to host byte order There's no need to convert values returned by arc4random to the network byte order. Spotted by Gleb Smirnoff (glebius@FreeBSD.org), thanks! ok tedu Obtained from: OpenBSD, mikeb , 367b0410d3 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 4 ++-- sys/netpfil/pf/pf_lb.c | 10 +++++----- sys/netpfil/pf/pf_norm.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index d4288ba34eb4..b6525b229c48 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6257,7 +6257,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, TH_SYN && r->keep_state == PF_STATE_SYNPROXY) { pf_set_protostate(s, PF_PEER_SRC, PF_TCPS_PROXY_SRC); pf_undo_nat(nr, pd, bip_sum); - s->src.seqhi = htonl(arc4random()); + s->src.seqhi = arc4random(); /* Find mss option */ int rtid = M_GETFIB(pd->m); mss = pf_get_mss(pd); @@ -6869,7 +6869,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate *state, u_short *reason) } state->src.max_win = MAX(ntohs(th->th_win), 1); if (state->dst.seqhi == 1) - state->dst.seqhi = htonl(arc4random()); + state->dst.seqhi = arc4random(); pf_send_tcp(state->rule, pd->af, &sk->addr[pd->sidx], &sk->addr[pd->didx], sk->port[pd->sidx], sk->port[pd->didx], diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 54a9463e34ef..9785611271a0 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -551,29 +551,29 @@ pf_map_addr(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, switch (af) { #ifdef INET case AF_INET: - rpool->counter.addr32[0] = htonl(arc4random()); + rpool->counter.addr32[0] = arc4random(); break; #endif /* INET */ #ifdef INET6 case AF_INET6: if (rmask->addr32[3] != 0xffffffff) rpool->counter.addr32[3] = - htonl(arc4random()); + arc4random(); else break; if (rmask->addr32[2] != 0xffffffff) rpool->counter.addr32[2] = - htonl(arc4random()); + arc4random(); else break; if (rmask->addr32[1] != 0xffffffff) rpool->counter.addr32[1] = - htonl(arc4random()); + arc4random(); else break; if (rmask->addr32[0] != 0xffffffff) rpool->counter.addr32[0] = - htonl(arc4random()); + arc4random(); break; #endif /* INET6 */ } diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 2dc4553bd4f4..1bf672f39204 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1493,7 +1493,7 @@ pf_normalize_tcp_init(struct pf_pdesc *pd, struct tcphdr *th, src->scrub->pfss_flags |= PFSS_TIMESTAMP; src->scrub->pfss_ts_mod = - htonl(arc4random()); + arc4random(); /* note PFSS_PAWS not set yet */ memcpy(&tsval, &opt[2],