From nobody Wed Sep 14 15:33:27 2022 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 4MSPVv5dcRz4cP6N; Wed, 14 Sep 2022 15:33:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MSPVv4lWcz3D5k; Wed, 14 Sep 2022 15:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663169607; 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=7VY9rsbVPSBYIayxuP2S2KtTy8f4WIYKR8b4jyvbiuE=; b=AyCEZ7tgmTDNfgel8v8Yi0BD9urdylvRuV8khZFXxoaH/TMsY9fsROP5R/wOK1SGCq44KR T1L5wDDi6SQi5Ydb/bFsoEiWj0hvMXYmcAWv4MOcFkiV7pn00LuklDeDmDac6znHawHYxd yQjKB5a+mzi0LKW8E9oQqrCVktao6UE1REwdQpq/owkmRM9025TAm3DhmPxZ47yWxl6qKb 00S80Nue4Dc6RDQ+bgrQtYFSMVCCQSSMMfOZTxUYkidHUm8VatRoBYwfd9l1Vyisxa6QNS xAzb+KWGNBqQGD62D9Gi5B7700cufM4D68OUTtek2f3qtoFGw1543OyaR6EDiQ== 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 4MSPVv3mTHzjND; Wed, 14 Sep 2022 15:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28EFXRXR085029; Wed, 14 Sep 2022 15:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28EFXR1c085028; Wed, 14 Sep 2022 15:33:27 GMT (envelope-from git) Date: Wed, 14 Sep 2022 15:33:27 GMT Message-Id: <202209141533.28EFXR1c085028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 15b73a2a14d1 - main - ip_reass: use correct comparison in ipreass_callout() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15b73a2a14d12a57bcdad8e6a5945396c0fd1e51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663169607; 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=7VY9rsbVPSBYIayxuP2S2KtTy8f4WIYKR8b4jyvbiuE=; b=TCGbKSF9IEWgyH0N3mVeLctDoR7AaNUhdLc53/zEAosEDg6MbfJORfdaAWDSdcH1SrqBsT pvLIIf22Of0o0/uJZ4LVqsTXdT+wcUlxStI4d6cC4GsGsxJbxRDrWM4kkViErxwb6Lge4e fhNEMn1FVLjDiKxbpeOLNH1ZZKaN7TEGsqHR63Q2ZFeN5cJj4BJsb1fbdWw9viiV6Dkmli OeCa38IQ2pghTWaMb2T7yEx5h2i0+M8ToWB1CBw6HUMTVMpf7FleHf+YO/MlvuJ1BrIvv5 fJa14IMNMqaUl1OOPRrdyvNxTK1PRGiWwzhdLTC+Wlc57AtOWamuLM2AD8NTpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663169607; a=rsa-sha256; cv=none; b=Gol/sKSXy4RlIrbJ89tgxOJ/VQ64CnJCgbQfw8UynCHUXX8eODH0qK3/L/+SuGHp4862ny u7Z1qsdZsdhPDgWOloPVGY6YqsMXBUm82jaOPec/AgvRVlV406Fyr7MTzZgasnq2iWF9A9 2hUAr/2jNFtuvbi4wxSpAQT62+Cl7vwUpLYVs2S3NTisSA6UIL1Kf99Baj5arZGXcdG78D 8S5EtG5Xg9FFiB0q0F7PSDRLUr64cNHpl1/FBxYJU7YAOnCvpeZ2ltD/YWNJ7JXB9szA3l fxAugpWOywf5Z362Yag8nlED4NCldU9UFbivB4fHNLFrZ6GTIiHqw4mWoMQJAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=15b73a2a14d12a57bcdad8e6a5945396c0fd1e51 commit 15b73a2a14d12a57bcdad8e6a5945396c0fd1e51 Author: Gleb Smirnoff AuthorDate: 2022-09-14 15:32:07 +0000 Commit: Gleb Smirnoff CommitDate: 2022-09-14 15:32:07 +0000 ip_reass: use correct comparison in ipreass_callout() Reported-by: syzbot+55415dc73f9b89b87fce@syzkaller.appspotmail.com --- sys/netinet/ip_reass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_reass.c b/sys/netinet/ip_reass.c index a10dff9c8acb..06cdbca2961c 100644 --- a/sys/netinet/ip_reass.c +++ b/sys/netinet/ip_reass.c @@ -599,11 +599,11 @@ ipreass_callout(void *arg) CURVNET_SET(bucket->vnet); fp = TAILQ_LAST(&bucket->head, ipqhead); - KASSERT(fp != NULL && fp->ipq_expire >= time_uptime, + KASSERT(fp != NULL && fp->ipq_expire <= time_uptime, ("%s: stray callout on bucket %p, %ju < %ju", __func__, bucket, fp ? (uintmax_t)fp->ipq_expire : 0, (uintmax_t)time_uptime)); - while (fp != NULL && fp->ipq_expire >= time_uptime) { + while (fp != NULL && fp->ipq_expire <= time_uptime) { ipq_timeout(bucket, fp); fp = TAILQ_LAST(&bucket->head, ipqhead); }