From nobody Fri Apr 17 11:55:44 2026 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 4fxtcc69Myz6ZdPs for ; Fri, 17 Apr 2026 11:55:44 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxtcc2d9gz47Lp for ; Fri, 17 Apr 2026 11:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776426944; 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=kGxTNkJxVXYcpc+fjVRmoMd+s5Z0jd/W0ig6fIdsBtY=; b=I8t1Y3MXplQRJHdx42Wajm8mQUtIJWHKjNtEP3O+n/4NzEI1ro9idJ+3ZGmXp8aRwszerr zHfQGkN9vuUvDoUCQaj/1CsuYMUHtgcP+9NfWFopF8LlVD6flsHlweKuBBOIJArHPxHPdF diUgy+Q4JHMLVjfOuowHK2BMuCUE6CA7aQHTitasWZX78sW771frQPi/eMPWl2fvzLSfOt xpvLJdL6nPsKWbIOeS9g9U56etrXROAP3gRzzPV/Sb2irNg+CJCr+OZtkITgvIdfrKHNew TekKrzpJ3vpBTThbh0RHNzb5zQUzf3Y0wwXqV/uOZ+GdBMw0lHn68sJMjWpwWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776426944; a=rsa-sha256; cv=none; b=UszP5uawhA0oGN9x/zOW8QfRkyCcVfw4UTTPSxEg/1KUFnH+0q3uEF/JPT1hah4yLYt2qA rPQ4tkItC7/x+0TGmWU+7jRcPXD4zpbs9jtbp7xErYikKNqkhtLY9zGo4wVvRi6UMjCpCQ RwHDFUoyzaGW4R0vq6ez7GiVVih5J8rzpKD83tqJrj7E3F/tvNnNhQM+HX755KIeW0EbdI cZKWwPn3EECFDr1Z4ouFe9K4D+sHmQGcH3u+RdG6SnrFtFEdLccAiwC3XAYTHv2A2GruJL bf8qXn/3Su2p3uGspbSy5dEUcZcw+nZmgk8z4DRCQpMkyFaSKOaCj5k5qFFvsA== 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=1776426944; 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=kGxTNkJxVXYcpc+fjVRmoMd+s5Z0jd/W0ig6fIdsBtY=; b=fbfeT8kSRInFYApmE6e+oOH6Eu3v/bLsWMEsION5W5Xkk4Ngb6eI79h8CVGGnTS6HrqZGk 0ZhAPMnYfQW94sEtv0/klDyt/XvcVcjoIQTC37hyTbl9m/Nj+2RQ1Blu8Ab9i7Pvn6aaL1 GSL42JhAUx4iL8NCrvAtEXJ2yUo78QLjOCsb1Bn+ome3fr5E9DJ/kV4WmPvUh2TSSctkm/ Af6Z4D2oi1jv/8oSjmEkMqiXYli6FnDZvMQbFW28Ap5+Zb34DYt2sTS//YrpmArTgT6pMP KJQ6nR0EzfuFWbtFt9IROJlaUb6CI+N+Uj0E0KfPo31w/RKut4+E0Qz52Zdjxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxtcc2DsVzsv3 for ; Fri, 17 Apr 2026 11:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aad1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 11:55:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 5b7192230a15 - main - pf: pf_frag_compare() should not be using subtraction to compare fragment IDs 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b7192230a15bbf2378b8f74278d21d4766c5110 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 11:55:44 +0000 Message-Id: <69e21fc0.3aad1.1f6b19eb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b7192230a15bbf2378b8f74278d21d4766c5110 commit 5b7192230a15bbf2378b8f74278d21d4766c5110 Author: Kristof Provost AuthorDate: 2026-04-16 13:51:54 +0000 Commit: Kristof Provost CommitDate: 2026-04-17 11:55:06 +0000 pf: pf_frag_compare() should not be using subtraction to compare fragment IDs Issues reported and patch submitted by: Renaud Allard OK sashan@ Obtained from: OpenBSD, sashan , 747740863c Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_norm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 1362ce5387bb..348c1cafbd49 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -236,10 +236,10 @@ pf_frnode_compare(struct pf_frnode *a, struct pf_frnode *b) static __inline int pf_frag_compare(struct pf_fragment *a, struct pf_fragment *b) { - int diff; - - if ((diff = a->fr_id - b->fr_id) != 0) - return (diff); + if (a->fr_id > b->fr_id) + return (1); + if (a->fr_id < b->fr_id) + return (-1); return (0); }