1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From 94378458d653b1edca86435026909592cbe5e793 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Fri, 19 Aug 2022 11:12:17 +0800
Subject: [PATCH] dlt-system: Fix buffer overflow detection on 32bit targets
On 32bit target, dlt-system will termiated with error:
dlt-system: *** buffer overflow detected ***: terminated
Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/398]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
src/system/dlt-system-watchdog.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c
index a2b01de..c0eaa12 100644
--- a/src/system/dlt-system-watchdog.c
+++ b/src/system/dlt-system-watchdog.c
@@ -109,8 +109,8 @@ int register_watchdog_fd(struct pollfd *pollfd, int fdcnt)
void watchdog_fd_handler(int fd)
{
- long int timersElapsed = 0;
- int r = read(fd, &timersElapsed, 8); // only needed to reset fd event
+ uint64_t timersElapsed = 0ULL;
+ int r = read(fd, &timersElapsed, 8U); // only needed to reset fd event
if(r < 0)
DLT_LOG(watchdogContext, DLT_LOG_ERROR, DLT_STRING("Could not reset systemd watchdog. Exit with: "),
DLT_STRING(strerror(r)));
@@ -120,4 +120,4 @@ void watchdog_fd_handler(int fd)
DLT_LOG(watchdogContext, DLT_LOG_DEBUG, DLT_STRING("systemd watchdog waited periodic\n"));
}
-#endif
\ No newline at end of file
+#endif
--
2.25.1
|
