git: 8d9cdf264e43 - stable/13 - sctp: store heartbeat creation time as time_t
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 01 Aug 2024 21:08:26 UTC
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=8d9cdf264e43209a367d519b9443888dd0bccdf4
commit 8d9cdf264e43209a367d519b9443888dd0bccdf4
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-05-10 18:40:15 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-08-01 21:07:52 +0000
sctp: store heartbeat creation time as time_t
Reported by: Coverity Scan
CID: 1493087
(cherry picked from commit b67716dd58b93f373523cf35373c56fcfad44b12)
---
sys/netinet/sctp_header.h | 2 +-
sys/netinet/sctp_output.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/netinet/sctp_header.h b/sys/netinet/sctp_header.h
index 811cb8bab158..0fbfbd213eed 100644
--- a/sys/netinet/sctp_header.h
+++ b/sys/netinet/sctp_header.h
@@ -83,7 +83,7 @@ struct sctp_supported_addr_param {
/* heartbeat info parameter */
struct sctp_heartbeat_info_param {
struct sctp_paramhdr ph;
- uint32_t time_value_1;
+ time_t time_value_1;
uint32_t time_value_2;
uint32_t random_value1;
uint32_t random_value2;
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index e719a5706f3b..bf4d383d732c 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -11286,7 +11286,7 @@ sctp_send_hb(struct sctp_tcb *stcb, struct sctp_nets *net, int so_locked)
/* Fill out hb parameter */
hb->heartbeat.hb_info.ph.param_type = htons(SCTP_HEARTBEAT_INFO);
hb->heartbeat.hb_info.ph.param_length = htons(sizeof(struct sctp_heartbeat_info_param));
- hb->heartbeat.hb_info.time_value_1 = (uint32_t)now.tv_sec;
+ hb->heartbeat.hb_info.time_value_1 = now.tv_sec;
hb->heartbeat.hb_info.time_value_2 = now.tv_usec;
/* Did our user request this one, put it in */
hb->heartbeat.hb_info.addr_family = (uint8_t)net->ro._l_addr.sa.sa_family;