From e061d61dbab1c83043875ec5031f4eec4eda6516 Mon Sep 17 00:00:00 2001 From: HirakawaTakara Date: Thu, 11 Dec 2025 00:35:05 +0000 Subject: [PATCH 1/2] Clean up module if mmap error occured and add more log information --- src/libevp-agent/module_impl_obj.c | 3 +++ src/libevp-agent/platform.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libevp-agent/module_impl_obj.c b/src/libevp-agent/module_impl_obj.c index ad10165a..bf8a9d42 100644 --- a/src/libevp-agent/module_impl_obj.c +++ b/src/libevp-agent/module_impl_obj.c @@ -114,6 +114,9 @@ module_impl_obj_load(struct module *m, const struct Module *modspec) return EINVAL; } } else if (ret != ENOENT) { + /* Clean up the module if some IO error occurs. */ + plat_mod_fs_file_unlink(m); + /* some IO error in check_hash */ return ret; } diff --git a/src/libevp-agent/platform.c b/src/libevp-agent/platform.c index 47b3ffc4..d4a5f99f 100644 --- a/src/libevp-agent/platform.c +++ b/src/libevp-agent/platform.c @@ -135,7 +135,8 @@ plat_mod_fs_file_mmap(struct module *module, const void **data, size_t *size, struct stat sb; if (fstat(fd, &sb) == -1) { *error = errno; - xlog_error("%s: error on stat: %d", __func__, *error); + xlog_error("%s: error on stat %s(%d): errno=%d", __func__, + filename, fd, *error); goto failure; } @@ -145,7 +146,8 @@ plat_mod_fs_file_mmap(struct module *module, const void **data, size_t *size, if (addr == MAP_FAILED) { *error = errno; - xlog_error("%s: error on mmap: %d", __func__, errno); + xlog_error("%s: error on mmap %s(%d): errno=%d, st_size=%zu", + __func__, filename, fd, errno, sb.st_size); goto failure; } From 6e4598f215e6ebd2ffff56107a51d8e9f99d6d2c Mon Sep 17 00:00:00 2001 From: "ryota.bando" Date: Thu, 11 Dec 2025 18:07:44 +0900 Subject: [PATCH 2/2] bump v1.48.4 -> v1.48.5 --- scripts/rules.mk | 2 +- version.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/rules.mk b/scripts/rules.mk index 151ef65c..006e03cb 100644 --- a/scripts/rules.mk +++ b/scripts/rules.mk @@ -7,7 +7,7 @@ all: # Macros related to the version of the agent -VERSION = 1.48.4 +VERSION = 1.48.5 SDK_VERSION = 1.0.0 # Default value for configuration macros diff --git a/version.mk b/version.mk index 5fb97eba..c9a56d73 100644 --- a/version.mk +++ b/version.mk @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -VERSION = 1.48.4 +VERSION = 1.48.5 COMMIT_HASH = $(shell git describe --always --abbrev=0 --dirty --match "NOT A TAG") define VERSION_BODY