dlt-daemon: cherry-pick another upstream-proposed patch

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gianfranco Costamagna 2023-11-13 12:39:42 +01:00 committed by Khem Raj
parent b1deec0de4
commit e080b9d718
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,36 @@
Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/567]
From c84e48f6986054cf8b9459e608235b7bd1635746 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Mon, 13 Nov 2023 12:37:23 +0100
Subject: [PATCH] dlt_cdh:
Make sure on 64 bit we read an ELF64 structure.
Otherwise we get a read error, and the context file is missing some good
to know information
---
src/core_dump_handler/dlt_cdh.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h
index 8608c6c4..3dac480a 100644
--- a/src/core_dump_handler/dlt_cdh.h
+++ b/src/core_dump_handler/dlt_cdh.h
@@ -45,10 +45,17 @@
#define CORE_FILE_PATTERN "%s/core.%d.%s.%d.gz"
#define CONTEXT_FILE_PATTERN "%s/context.%d.%s.%d.txt"
+#if ((__SIZEOF_POINTER) == 4)
#define ELF_Ehdr Elf32_Ehdr
#define ELF_Phdr Elf32_Phdr
#define ELF_Shdr Elf32_Shdr
#define ELF_Nhdr Elf32_Nhdr
+#else
+#define ELF_Ehdr Elf64_Ehdr
+#define ELF_Phdr Elf64_Phdr
+#define ELF_Shdr Elf64_Shdr
+#define ELF_Nhdr Elf64_Nhdr
+#endif
typedef struct
{

View File

@ -18,6 +18,7 @@ SRC_URI = "git://github.com/COVESA/${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://544.patch \
file://567.patch \
"
SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"