From nobody Sat Aug 03 22:26:40 2024 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 4Wby3j1Qx3z5RRj9; Sat, 03 Aug 2024 22:26:41 +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 4Wby3j0xl1z4GD8; Sat, 3 Aug 2024 22:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722724001; 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=0BtTLgtEU5hWeuJSZeHKaJ95qdZ6ihFkbMUCS2H96SY=; b=sah3MN78KhH7SnhlcYcXIbjEtWhLkmqogKKx6Z69FMYdAAiTu7t5/Vw9SNvs5cGSDEApQe 1egQSixB4kUDh78RIscuLGXi5KPnsK/S+mDYdO+vbkiXhf7C8Y+vMVURDaTnKeEn8JlZ29 NsgYkN3K9kJMYdrcgkqFz4z74kGcp0WF1fxydh0zjlOuLypvVkm/RWnu6lgRk4p9mwG4ny /9Zq3Y4n+yePz7WKN/xIG5X57UJpIp0YdC/d0GCOZsVnwwWUDf8B5IWOiSpfRqP7xo+vNi yoFsqlIXdMgRnP9W+v3YFq1JubGttGCJDtQYTpYOrndByy119Mdl2k8YUf75PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722724001; a=rsa-sha256; cv=none; b=xGdyjXdYv54/Nyom1Y4dtnf/ICFirkAMYhNSg1Y8/2r1i6JjVJ7yAJ0xMd6Xx5Cwfu/8L1 yQqKovCK7QwES565tTp/DEIZbwWq7eutAfBm6tep0OgVR8gJb+FotnMyXp2lkGWHIndhrR HoPhMN5a2XIzh8Z1sJw90S2UNB18bDsrIeBDMHgC6emztZMqkf6UZPOMzVjePXIszgSzXQ FvTHEQ+f55igiB9eqSdzFX49LQdeKldKTI6WwfJN0bijyJMfNYmLHbcPp+/VpW8RYfzatX HHSnlTAwE3eZ65FGfAVUZvSPSERIqnXiQ81d6zSjmK84H7PdQvw9wp4dwnYy5Q== 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=1722724001; 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=0BtTLgtEU5hWeuJSZeHKaJ95qdZ6ihFkbMUCS2H96SY=; b=R85Nholy4pYurGfhG3eVMCpaxXALSb00FcrmrPo3N/G2GG1bDIA06P9ePYOHMhyxuehBnE JLPFtrlKifQdnpg9GnEm6dJCxnzxxmQU2s9fRNlq9EeYamHy1LyMHKXnir1BaMAjrlhKZh ChU+GgheitrSlzvqDmq3vomB3tm2EUCPXXc2rZlyGXmravfGaffQkpV0zkdj9PUjGlQjHH +qmPUn7Z6/3ifvLJfH067kB6Iki16JyK45MXdwwZDw4TSH7Qz+wMWb7KTqEwSw/hoi3r8r JXBEL8Gco9WPQTEHwOEPT9jxL9jyVRTse8pxErgKuxreIiwTdHmsigs5kIRWbg== 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 4Wby3j0S1XzSyk; Sat, 3 Aug 2024 22:26:41 +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 473MQeTw026473; Sat, 3 Aug 2024 22:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473MQeZA026470; Sat, 3 Aug 2024 22:26:40 GMT (envelope-from git) Date: Sat, 3 Aug 2024 22:26:40 GMT Message-Id: <202408032226.473MQeZA026470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 1593585b5ab0 - stable/14 - sctp: store vtag expire time as time_t 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1593585b5ab020dcca655cfbf2208e681a4bf4b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1593585b5ab020dcca655cfbf2208e681a4bf4b6 commit 1593585b5ab020dcca655cfbf2208e681a4bf4b6 Author: Michael Tuexen AuthorDate: 2024-05-10 18:25:04 +0000 Commit: Michael Tuexen CommitDate: 2024-08-03 22:26:10 +0000 sctp: store vtag expire time as time_t Reported by: Coverity Scan CID: 1492525 CID: 1493239 (cherry picked from commit 42aeb8d490fb7e8f4c9d27b3797179b861bd85e3) --- sys/netinet/sctp_pcb.c | 12 ++++++------ sys/netinet/sctp_pcb.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 69c492bc58df..b2cafdc2f81e 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -4541,7 +4541,7 @@ sctp_del_remote_addr(struct sctp_tcb *stcb, struct sockaddr *remaddr) } static bool -sctp_is_in_timewait(uint32_t tag, uint16_t lport, uint16_t rport, uint32_t now) +sctp_is_in_timewait(uint32_t tag, uint16_t lport, uint16_t rport, time_t now) { struct sctpvtaghead *chain; struct sctp_tagblock *twait_block; @@ -4563,7 +4563,7 @@ sctp_is_in_timewait(uint32_t tag, uint16_t lport, uint16_t rport, uint32_t now) } static void -sctp_set_vtag_block(struct sctp_timewait *vtag_block, uint32_t time, +sctp_set_vtag_block(struct sctp_timewait *vtag_block, time_t time, uint32_t tag, uint16_t lport, uint16_t rport) { vtag_block->tv_sec_at_expire = time; @@ -4578,13 +4578,13 @@ sctp_add_vtag_to_timewait(uint32_t tag, uint16_t lport, uint16_t rport) struct sctpvtaghead *chain; struct sctp_tagblock *twait_block; struct timeval now; - uint32_t time; + time_t time; int i; bool set; SCTP_INP_INFO_WLOCK_ASSERT(); (void)SCTP_GETTIME_TIMEVAL(&now); - time = (uint32_t)now.tv_sec + SCTP_BASE_SYSCTL(sctp_vtag_time_wait); + time = now.tv_sec + SCTP_BASE_SYSCTL(sctp_vtag_time_wait); chain = &SCTP_BASE_INFO(vtag_timewait)[(tag % SCTP_STACK_VTAG_HASH_SIZE)]; set = false; LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) { @@ -4596,7 +4596,7 @@ sctp_add_vtag_to_timewait(uint32_t tag, uint16_t lport, uint16_t rport) continue; } if ((twait_block->vtag_block[i].v_tag != 0) && - (twait_block->vtag_block[i].tv_sec_at_expire < (uint32_t)now.tv_sec)) { + (twait_block->vtag_block[i].tv_sec_at_expire < now.tv_sec)) { if (set) { /* Audit expires this guy */ sctp_set_vtag_block(twait_block->vtag_block + i, 0, 0, 0, 0); @@ -6746,7 +6746,7 @@ sctp_is_vtag_good(uint32_t tag, uint16_t lport, uint16_t rport, struct timeval * return (false); } } - return (!sctp_is_in_timewait(tag, lport, rport, (uint32_t)now->tv_sec)); + return (!sctp_is_in_timewait(tag, lport, rport, now->tv_sec)); } static void diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 5c6ead92bf9b..ade29fb3544d 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -130,7 +130,7 @@ struct sctp_block_entry { }; struct sctp_timewait { - uint32_t tv_sec_at_expire; /* the seconds from boot to expire */ + time_t tv_sec_at_expire; /* the seconds from boot to expire */ uint32_t v_tag; /* the vtag that can not be reused */ uint16_t lport; /* the local port used in vtag */ uint16_t rport; /* the remote port used in vtag */