From nobody Wed Apr 09 09:51:42 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 4ZXdWg2BQVz5sqGg; Wed, 09 Apr 2025 09:51:43 +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 4ZXdWf6Qf5z3xrh; Wed, 09 Apr 2025 09:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744192302; 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=3qnU1AN6OUbgOp0ZHk5QC5SGcszEwqwS5xGJDGKj9lA=; b=Nja2GFX0CR31PXVtjuAW4Jajy1GLd70DuS7/uCS9p0CdTYOl9RsziW9TK0wuX8zeJhXz0L GxHhmJI3fzBFLabk1PvW7X20IokmuyqEY41fKzTZjdA5AhaFDeU5IE5NBBOudnWV1i4VdZ x9UL8iyyU7gmCME+BxTOjjapBeWAyPPYsi6cjYbKsni6rxlxVfA4hN7ad4OE/ArqikNLsB oSq5JFkhmsw935ljUnf8ciOk8tDGJah5XWXJIIG1TvPmRemFNj3R3+v7K4+ibEXcP/rnwz l4W6qAT8fmO/nHrFumBQHyvLDWkRKWxIMPA58jPfK8uhfIpBHxJlyCQSa3NL0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744192302; a=rsa-sha256; cv=none; b=VnNToq6vxXcnm1cGusAaJaWqUfbKaszm4r7xGgdfm+oGPFgppkA/QfPWPiEITfJqL5X+mx 0sZEbfjWc+byhLojzNiI4xbrDgPQE5KwAInZCz4qf7mUcnE/6SaeXMvCyyXgqe6AeO8Tjw 8CDVf/8FW5+bVh4PV+52t0XqPs5LqS7S8szNdmc/hxvz1MESGpbguFzox8QnUdrj7xKblo n02ZcpQ6S0/fprW9jA1G2FYjWcNuKbwmEd15pPiTp0vVPDUxlh0SOxApsf0OyTArCKDrer 3GetWnMCs+dUDcqgn928JkEDhu7HDsDzjwckMB6wu1C0QHmkx5qTVV3sF7le9A== 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=1744192302; 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=3qnU1AN6OUbgOp0ZHk5QC5SGcszEwqwS5xGJDGKj9lA=; b=NsnVGXDWtTw4MF5OySlMdLlkJdrMZR8Xy5Rb3uiZIOVDN+Y9riDbLcm+0X7u2MpX5qOdNv wgMpDs33JQS3GvA2olSzygJbhCrIRFj0OPxTqHML6od6fz6DpwNmZYMsmZgtrIy8mzF2Vp oxilv0fUWIbO0B/Jvuf65RqtT2IfiA+BO3hSieRMMUJya8Ij6jwAtGE/1/v6VllLq6NGnS JyEWXoIboqD5juiO+r+avCEjqPMEcXxGduSXsAWVnBbfThekS+g+JQ3MnVwLtGWCDy54td 0Pla7L21uo0chRkiA+h93AXLnzzfYT3VQkWdQswUgPlVM48pA2dxZuLGtpTxEQ== 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 4ZXdWf62HWz1BYb; Wed, 09 Apr 2025 09:51:42 +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 5399pg9s090937; Wed, 9 Apr 2025 09:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5399pgdO090932; Wed, 9 Apr 2025 09:51:42 GMT (envelope-from git) Date: Wed, 9 Apr 2025 09:51:42 GMT Message-Id: <202504090951.5399pgdO090932@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: 9d38d2203b32 - main - pf: unused arguments at pf_normalize_tcp_init() 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: 9d38d2203b3281a8f5921c27cccd32186cbf9cee Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9d38d2203b3281a8f5921c27cccd32186cbf9cee commit 9d38d2203b3281a8f5921c27cccd32186cbf9cee Author: Kristof Provost AuthorDate: 2025-04-08 15:45:49 +0000 Commit: Kristof Provost CommitDate: 2025-04-09 08:18:20 +0000 pf: unused arguments at pf_normalize_tcp_init() OK deraadt. Obtained from: OpenBSD, sashan , eaed871b13 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 +- sys/netpfil/pf/pf.c | 4 ++-- sys/netpfil/pf/pf_norm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index c511d61d6cc1..74926581e247 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2475,7 +2475,7 @@ void pf_normalize_cleanup(void); int pf_normalize_tcp(struct pf_pdesc *); void pf_normalize_tcp_cleanup(struct pf_kstate *); int pf_normalize_tcp_init(struct pf_pdesc *, - struct tcphdr *, struct pf_state_peer *, struct pf_state_peer *); + struct tcphdr *, struct pf_state_peer *); int pf_normalize_tcp_stateful(struct pf_pdesc *, u_short *, struct tcphdr *, struct pf_kstate *, struct pf_state_peer *, struct pf_state_peer *, int *); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 5f5f2403e448..3d22b6750c34 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6182,7 +6182,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (pd->proto == IPPROTO_TCP) { if (s->state_flags & PFSTATE_SCRUB_TCP && - pf_normalize_tcp_init(pd, th, &s->src, &s->dst)) { + pf_normalize_tcp_init(pd, th, &s->src)) { REASON_SET(&reason, PFRES_MEMORY); goto csfailed; } @@ -6438,7 +6438,7 @@ pf_tcp_track_full(struct pf_kstate *state, struct pf_pdesc *pd, if ((state->state_flags & PFSTATE_SCRUB_TCP || dst->scrub) && src->scrub == NULL) { - if (pf_normalize_tcp_init(pd, th, src, dst)) { + if (pf_normalize_tcp_init(pd, th, src)) { REASON_SET(reason, PFRES_MEMORY); return (PF_DROP); } diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index be8ba939e5d9..382f876234da 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1429,7 +1429,7 @@ pf_normalize_tcp(struct pf_pdesc *pd) int pf_normalize_tcp_init(struct pf_pdesc *pd, struct tcphdr *th, - struct pf_state_peer *src, struct pf_state_peer *dst) + struct pf_state_peer *src) { u_int32_t tsval, tsecr; u_int8_t hdr[60];