From e4f8e83541229888e63113debb21c3fde3a0e7d8 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 19 Aug 2022 17:58:04 +0800 Subject: dlt-daemon: fix dlt-system.service failed since buffer overflow dlt-system.service start failed with error: dlt-system[367]: *** buffer overflow detected ***: terminated dlt-system.service: Failed with result 'watchdog'. dlt-system.service: Main process exited, code=dumped, status=6/ABRT dlt-system.service: Watchdog timeout (limit 2s)! Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- ...Fix-buffer-overflow-detection-on-32bit-ta.patch | 40 ++++++++++++++++++++++ .../dlt-daemon/dlt-daemon_2.18.8.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch (limited to 'meta-oe/recipes-extended/dlt-daemon') diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch new file mode 100644 index 0000000000..e7e6cb3b1a --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch @@ -0,0 +1,40 @@ +From 94378458d653b1edca86435026909592cbe5e793 Mon Sep 17 00:00:00 2001 +From: Changqing Li +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 +--- + 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 + diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb index 7a613bcc93..aa5ef46a9d 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb @@ -18,6 +18,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ + file://0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch \ " SRCREV = "6a3bd901d825c7206797e36ea98e10a218f5aad2" -- cgit 1.2.3-korg