mirror of
https://github.com/torvalds/linux
synced 2024-07-25 12:42:37 +00:00
548c2ede0d
strerror_r(), used from libbpf-specific libbpf_strerror_r() wrapper is documented to return error in two different ways, depending on glibc version. Take that into account when handling strerror_r()'s own errors, which happens when we pass some non-standard (internal) kernel error to it. Before this patch we'd have "ERROR: strerror_r(524)=22", which is quite confusing. Now for the same situation we'll see a bit less visually scary "unknown error (-524)". At least we won't confuse user with irrelevant EINVAL (22). Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/r/20240507001335.1445325-5-andrii@kernel.org Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
34 lines
1,020 B
C
34 lines
1,020 B
C
// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
|
|
#undef _GNU_SOURCE
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include "str_error.h"
|
|
|
|
/* make sure libbpf doesn't use kernel-only integer typedefs */
|
|
#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
|
|
|
|
/*
|
|
* Wrapper to allow for building in non-GNU systems such as Alpine Linux's musl
|
|
* libc, while checking strerror_r() return to avoid having to check this in
|
|
* all places calling it.
|
|
*/
|
|
char *libbpf_strerror_r(int err, char *dst, int len)
|
|
{
|
|
int ret = strerror_r(err < 0 ? -err : err, dst, len);
|
|
/* on glibc <2.13, ret == -1 and errno is set, if strerror_r() can't
|
|
* handle the error, on glibc >=2.13 *positive* (errno-like) error
|
|
* code is returned directly
|
|
*/
|
|
if (ret == -1)
|
|
ret = errno;
|
|
if (ret) {
|
|
if (ret == EINVAL)
|
|
/* strerror_r() doesn't recognize this specific error */
|
|
snprintf(dst, len, "unknown error (%d)", err < 0 ? err : -err);
|
|
else
|
|
snprintf(dst, len, "ERROR: strerror_r(%d)=%d", err, ret);
|
|
}
|
|
return dst;
|
|
}
|