summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-12-03 17:33:42 +0100
committerLennart Poettering <lennart@poettering.net>2018-12-03 17:35:50 +0100
commit02e062262f39a3002c1242954d4b04a5061d69bf (patch)
tree6bc6054f90df4831d0fd4b7adafee4d5eda9a382
parent7fdf40d247361a510661915fbbddddb97b9aa8ff (diff)
downloadsystemd-02e062262f39a3002c1242954d4b04a5061d69bf.tar.gz
sd-bus: use _variable_no_sanitize_address_ also for BUS_ERROR_MAP_ELF_REGISTER
-rw-r--r--src/libsystemd/sd-bus/bus-error.c2
-rw-r--r--src/libsystemd/sd-bus/bus-error.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index 06097d0b48..dc952375b6 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -90,7 +90,6 @@ static int bus_error_name_to_errno(const char *name) {
}
m = ALIGN_TO_PTR(__start_SYSTEMD_BUS_ERROR_MAP, sizeof(void*));
-#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
while (m < __stop_SYSTEMD_BUS_ERROR_MAP) {
/* For magic ELF error maps, the end marker might
* appear in the middle of things, since multiple maps
@@ -108,7 +107,6 @@ static int bus_error_name_to_errno(const char *name) {
m++;
}
-#endif
return EIO;
}
diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h
index c1758c46bb..a6523e57a2 100644
--- a/src/libsystemd/sd-bus/bus-error.h
+++ b/src/libsystemd/sd-bus/bus-error.h
@@ -33,7 +33,8 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_lis
#define BUS_ERROR_MAP_ELF_REGISTER \
_section_("SYSTEMD_BUS_ERROR_MAP") \
_used_ \
- _alignptr_
+ _alignptr_ \
+ _variable_no_sanitize_address_
#define BUS_ERROR_MAP_ELF_USE(errors) \
extern const sd_bus_error_map errors[]; \