Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 1 | From 0542d27ebbb250c09bdcfcf9f2ea3d27426fe522 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Tue, 10 Jul 2018 15:40:17 +0800 |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 4 | Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 5 | strerror_r |
| 6 | |
| 7 | XSI-compliant strerror_r and GNU-specifi strerror_r are different. |
| 8 | |
| 9 | int strerror_r(int errnum, char *buf, size_t buflen); |
| 10 | /* XSI-compliant */ |
| 11 | |
| 12 | char *strerror_r(int errnum, char *buf, size_t buflen); |
| 13 | /* GNU-specific */ |
| 14 | |
| 15 | We need to distinguish between them. Otherwise, we'll get an int value |
| 16 | assigned to (char *) variable, resulting in segment fault. |
| 17 | |
| 18 | Upstream-Status: Inappropriate [musl specific] |
| 19 | |
| 20 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 21 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | --- |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 23 | src/libsystemd/sd-bus/bus-error.c | 5 +++++ |
| 24 | src/libsystemd/sd-journal/journal-send.c | 5 +++++ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 25 | 2 files changed, 10 insertions(+) |
| 26 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 27 | --- a/src/libsystemd/sd-bus/bus-error.c |
| 28 | +++ b/src/libsystemd/sd-bus/bus-error.c |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 29 | @@ -409,7 +409,12 @@ static void bus_error_strerror(sd_bus_er |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 30 | return; |
| 31 | |
| 32 | errno = 0; |
| 33 | +#ifndef __GLIBC__ |
| 34 | + strerror_r(error, m, k); |
| 35 | + x = m; |
| 36 | +#else |
| 37 | x = strerror_r(error, m, k); |
| 38 | +#endif |
| 39 | if (errno == ERANGE || strlen(x) >= k - 1) { |
| 40 | free(m); |
| 41 | k *= 2; |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 42 | @@ -594,8 +599,12 @@ const char* _bus_error_message(const sd_ |
| 43 | |
| 44 | if (e && e->message) |
| 45 | return e->message; |
| 46 | - |
| 47 | +#ifndef __GLIBC__ |
| 48 | + strerror_r(abs(error), buf, ERRNO_BUF_LEN); |
| 49 | + return buf; |
| 50 | +#else |
| 51 | return strerror_r(abs(error), buf, ERRNO_BUF_LEN); |
| 52 | +#endif |
| 53 | } |
| 54 | |
| 55 | static bool map_ok(const sd_bus_error_map *map) { |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 56 | --- a/src/libsystemd/sd-journal/journal-send.c |
| 57 | +++ b/src/libsystemd/sd-journal/journal-send.c |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 58 | @@ -381,7 +381,12 @@ static int fill_iovec_perror_and_send(co |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 59 | char* j; |
| 60 | |
| 61 | errno = 0; |
| 62 | +#ifndef __GLIBC__ |
| 63 | + strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); |
| 64 | + j = buffer + 8 + k; |
| 65 | +#else |
| 66 | j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); |
| 67 | +#endif |
| 68 | if (errno == 0) { |
| 69 | char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; |
| 70 | |