d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add handling for non-native error values to libsysdecode.

Browse Source 
Add two new functions, sysdecode_abi_to_freebsd_errno() and
sysdecode_freebsd_to_abi_errno(), which convert errno values between
the native FreeBSD ABI and other supported ABIs. Note that the
mappings are not necessarily perfect meaning in some cases multiple
errors in one ABI might map to a single error in another ABI. In that
case, the reverse mapping will return one of the errors that maps, but
which error is non-deterministic.

Change truss to always report the raw error value to the user but
use libsysdecode to map it to a native errno value that can be used
with strerror() to generate a description. Previously truss reported
the "converted" error value. Now the user will always see the exact
error value that the application sees.

Change kdump to report the truly raw error value to the user. Previously
kdump would report the absolute value of the raw error value (so for
Linux binaries it didn't output the FreeBSD error value, but the positive
value of the Linux error). Now it reports the real (i.e. negative) error
value for Linux binaries. Also, use libsysdecode to convert the native
FreeBSD error reported in the ktrace record to the raw error used by the
ABI. This means that the Linux ABI can now be handled directly in
ktrsysret() and removes the need for linux_ktrsysret().

Reviewed by:	bdrewery, kib
Helpful notes:	wblock (manpage)
Differential Revision:	https://reviews.freebsd.org/D5314
This commit is contained in:
John Baldwin 2016-02-23 20:00:55 +00:00
parent d70876fd7e
commit 287b96dd25
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=295931
15 changed files with 322 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libsysdecode/Makefile
View File

@ -4,15 +4,17 @@
LIB= sysdecode
SRCS= ioctl.c syscallnames.c utrace.c
SRCS= errno.c ioctl.c syscallnames.c utrace.c
INCS= sysdecode.h
CFLAGS+= -I${.CURDIR}/../../sys
MAN+= sysdecode.3 \
sysdecode_abi_to_freebsd_errno.3 \
sysdecode_ioctlname.3 \
sysdecode_syscallnames.3 \
sysdecode_utrace.3
MLINKS+= sysdecode_abi_to_freebsd_errno.3 sysdecode_freebsd_to_abi_errno.3
CLEANFILES= ioctl.c

209
lib/libsysdecode/errno.c Normal file
View File

@ -0,0 +1,209 @@
/*-
* Copyright (c) 2015 John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <sysdecode.h>
#if defined(__i386__) || defined(__amd64__)
/*
* Linux syscalls return negative errno's, we do positive and map them
* Reference:
* FreeBSD: src/sys/sys/errno.h
* Linux: linux-2.6.17.8/include/asm-generic/errno-base.h
* linux-2.6.17.8/include/asm-generic/errno.h
*/
static int bsd_to_linux_errno[ELAST + 1] = {
-0, -1, -2, -3, -4, -5, -6, -7, -8, -9,
-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
-30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
-90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
-6, -6, -43, -42, -75,-125, -84, -95, -16, -74,
-72, -67, -71
};
#endif
#if defined(__aarch64__) || defined(__amd64__)
#include <compat/cloudabi/cloudabi_syscalldefs.h>
static const int cloudabi_errno_table[] = {
[CLOUDABI_E2BIG] = E2BIG,
[CLOUDABI_EACCES] = EACCES,
[CLOUDABI_EADDRINUSE] = EADDRINUSE,
[CLOUDABI_EADDRNOTAVAIL] = EADDRNOTAVAIL,
[CLOUDABI_EAFNOSUPPORT] = EAFNOSUPPORT,
[CLOUDABI_EAGAIN] = EAGAIN,
[CLOUDABI_EALREADY] = EALREADY,
[CLOUDABI_EBADF] = EBADF,
[CLOUDABI_EBADMSG] = EBADMSG,
[CLOUDABI_EBUSY] = EBUSY,
[CLOUDABI_ECANCELED] = ECANCELED,
[CLOUDABI_ECHILD] = ECHILD,
[CLOUDABI_ECONNABORTED] = ECONNABORTED,
[CLOUDABI_ECONNREFUSED] = ECONNREFUSED,
[CLOUDABI_ECONNRESET] = ECONNRESET,
[CLOUDABI_EDEADLK] = EDEADLK,
[CLOUDABI_EDESTADDRREQ] = EDESTADDRREQ,
[CLOUDABI_EDOM] = EDOM,
[CLOUDABI_EDQUOT] = EDQUOT,
[CLOUDABI_EEXIST] = EEXIST,
[CLOUDABI_EFAULT] = EFAULT,
[CLOUDABI_EFBIG] = EFBIG,
[CLOUDABI_EHOSTUNREACH] = EHOSTUNREACH,
[CLOUDABI_EIDRM] = EIDRM,
[CLOUDABI_EILSEQ] = EILSEQ,
[CLOUDABI_EINPROGRESS] = EINPROGRESS,
[CLOUDABI_EINTR] = EINTR,
[CLOUDABI_EINVAL] = EINVAL,
[CLOUDABI_EIO] = EIO,
[CLOUDABI_EISCONN] = EISCONN,
[CLOUDABI_EISDIR] = EISDIR,
[CLOUDABI_ELOOP] = ELOOP,
[CLOUDABI_EMFILE] = EMFILE,
[CLOUDABI_EMLINK] = EMLINK,
[CLOUDABI_EMSGSIZE] = EMSGSIZE,
[CLOUDABI_EMULTIHOP] = EMULTIHOP,
[CLOUDABI_ENAMETOOLONG] = ENAMETOOLONG,
[CLOUDABI_ENETDOWN] = ENETDOWN,
[CLOUDABI_ENETRESET] = ENETRESET,
[CLOUDABI_ENETUNREACH] = ENETUNREACH,
[CLOUDABI_ENFILE] = ENFILE,
[CLOUDABI_ENOBUFS] = ENOBUFS,
[CLOUDABI_ENODEV] = ENODEV,
[CLOUDABI_ENOENT] = ENOENT,
[CLOUDABI_ENOEXEC] = ENOEXEC,
[CLOUDABI_ENOLCK] = ENOLCK,
[CLOUDABI_ENOLINK] = ENOLINK,
[CLOUDABI_ENOMEM] = ENOMEM,
[CLOUDABI_ENOMSG] = ENOMSG,
[CLOUDABI_ENOPROTOOPT] = ENOPROTOOPT,
[CLOUDABI_ENOSPC] = ENOSPC,
[CLOUDABI_ENOSYS] = ENOSYS,
[CLOUDABI_ENOTCONN] = ENOTCONN,
[CLOUDABI_ENOTDIR] = ENOTDIR,
[CLOUDABI_ENOTEMPTY] = ENOTEMPTY,
[CLOUDABI_ENOTRECOVERABLE] = ENOTRECOVERABLE,
[CLOUDABI_ENOTSOCK] = ENOTSOCK,
[CLOUDABI_ENOTSUP] = ENOTSUP,
[CLOUDABI_ENOTTY] = ENOTTY,
[CLOUDABI_ENXIO] = ENXIO,
[CLOUDABI_EOVERFLOW] = EOVERFLOW,
[CLOUDABI_EOWNERDEAD] = EOWNERDEAD,
[CLOUDABI_EPERM] = EPERM,
[CLOUDABI_EPIPE] = EPIPE,
[CLOUDABI_EPROTO] = EPROTO,
[CLOUDABI_EPROTONOSUPPORT] = EPROTONOSUPPORT,
[CLOUDABI_EPROTOTYPE] = EPROTOTYPE,
[CLOUDABI_ERANGE] = ERANGE,
[CLOUDABI_EROFS] = EROFS,
[CLOUDABI_ESPIPE] = ESPIPE,
[CLOUDABI_ESRCH] = ESRCH,
[CLOUDABI_ESTALE] = ESTALE,
[CLOUDABI_ETIMEDOUT] = ETIMEDOUT,
[CLOUDABI_ETXTBSY] = ETXTBSY,
[CLOUDABI_EXDEV] = EXDEV,
[CLOUDABI_ENOTCAPABLE] = ENOTCAPABLE,
};
#endif
int
sysdecode_abi_to_freebsd_errno(enum sysdecode_abi abi, int error)
{
switch (abi) {
case SYSDECODE_ABI_FREEBSD:
case SYSDECODE_ABI_FREEBSD32:
return (error);
#if defined(__i386__) || defined(__amd64__)
case SYSDECODE_ABI_LINUX:
case SYSDECODE_ABI_LINUX32: {
unsigned int i;
/*
* This is imprecise since it returns the first
* matching errno.
*/
for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
if (error == bsd_to_linux_errno[i])
return (i);
}
break;
}
#endif
#if defined(__aarch64__) || defined(__amd64__)
case SYSDECODE_ABI_CLOUDABI64:
if (error >= 0 &&
(unsigned int)error < nitems(cloudabi_errno_table))
return (cloudabi_errno_table[error]);
break;
#endif
default:
break;
}
return (INT_MAX);
}
int
sysdecode_freebsd_to_abi_errno(enum sysdecode_abi abi, int error)
{
switch (abi) {
case SYSDECODE_ABI_FREEBSD:
case SYSDECODE_ABI_FREEBSD32:
return (error);
#if defined(__i386__) || defined(__amd64__)
case SYSDECODE_ABI_LINUX:
case SYSDECODE_ABI_LINUX32:
if (error >= 0 && error <= ELAST)
return (bsd_to_linux_errno[error]);
break;
#endif
#if defined(__aarch64__) || defined(__amd64__)
case SYSDECODE_ABI_CLOUDABI64: {
unsigned int i;
for (i = 0; i < nitems(cloudabi_errno_table); i++) {
if (error == cloudabi_errno_table[i])
return (i);
}
break;
}
#endif
default:
break;
}
return (INT_MAX);
}

1
lib/libsysdecode/sysdecode.3
View File

@ -64,6 +64,7 @@ Supported on aarch64 and amd64.
A placeholder for use when the ABI is not known.
.El
.Sh SEE ALSO
.Xr sysdecode_abi_to_freebsd_errno 3 ,
.Xr sysdecode_ioctlname 3 ,
.Xr sysdecode_syscallnames 3 ,
.Xr sysdecode_utrace 3

2
lib/libsysdecode/sysdecode.h
View File

@ -38,6 +38,8 @@ enum sysdecode_abi {
SYSDECODE_ABI_CLOUDABI64
};
int sysdecode_abi_to_freebsd_errno(enum sysdecode_abi _abi, int _error);
int sysdecode_freebsd_to_abi_errno(enum sysdecode_abi _abi, int _error);
const char *sysdecode_ioctlname(unsigned long _val);
const char *sysdecode_syscallname(enum sysdecode_abi _abi, unsigned int _code);
int sysdecode_utrace(FILE *_fp, void *_buf, size_t _len);

94
lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3 Normal file
View File

@ -0,0 +1,94 @@
.\"
.\" Copyright (c) 2016 John Baldwin <jhb@FreeBSD.org>
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD$
.\"
.Dd February 23, 2016
.Dt sysdecode_abi_to_freebsd_errno 3
.Os
.Sh NAME
.Nm sysdecode_abi_to_freebsd_errno ,
.Nm sysdecode_freebsd_to_abi_errno
.Nd translate error numbers between process ABIs
.Sh LIBRARY
.Lb libsysdecode
.Sh SYNOPSIS
.Ft int
.Fn sysdecode_abi_to_freebsd_errno "enum sysdecode_abi abi" "int error"
.Ft int
.Fn sysdecode_freebsd_to_abi_errno "enum sysdecode_abi abi" "int error"
.Sh DESCRIPTION
The
.Fn sysdecode_abi_to_freebsd_errno
function returns the native
.Xr errno 3
value that corresponds to the error indicated by
.Fa error
for the process ABI
.Fa abi .
If
.Fa error
does not identify a valid error for
.Fa abi ,
.Dv INT_MAX
is returned.
.Pp
The
.Fn sysdecode_freebsd_to_abi_errno
function the error value for the process ABI
.Fa abi
that corresponds to the native
.Xr errno 3
value
.Fa error .
If
.Fa error
does not identify a valid
.Xr errno 3
error,
.Dv INT_MAX
is returned.
.Pp
Note that the mappings between native
.Xr errno 3
values and errors for other ABIs are not exhaustive.
If a mapping does not exist,
these functions return
.Dv INT_MAX .
In addition, multiple error values in one ABI may map to a single
error in another ABI.
.Sh RETURN VALUES
These functions return an error value on success or
.Dv INT_MAX
if
.Fa error
is not valid.
.Pp
For the list of supported ABIs,
see
.Xr sysdecode 3 .
.Sh SEE ALSO
.Xr sysdecode 3 ,
.Xr sysdecode_syscallnames 3

5
lib/libsysdecode/sysdecode_syscallnames.3
View File

@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd January 24, 2016
.Dd January 30, 2016
.Dt sysdecode_syscallnames 3
.Os
.Sh NAME
@ -64,4 +64,5 @@ or
.Fa ABI
is invalid .
.Sh SEE ALSO
.Xr sysdecode 3
.Xr sysdecode 3 ,
.Xr sysdecode_abi_to_freebsd_errno 3

71
usr.bin/kdump/kdump.c
View File

@ -142,28 +142,6 @@ static struct ktr_header ktr_header;
c = ','; \
} while (0)
#if defined(__amd64__) || defined(__i386__)
void linux_ktrsysret(struct ktr_sysret *, u_int);
/*
* from linux.h
* Linux syscalls return negative errno's, we do positive and map them
*/
static int bsd_to_linux_errno[ELAST + 1] = {
-0, -1, -2, -3, -4, -5, -6, -7, -8, -9,
-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
-30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
-90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
-6, -6, -43, -42, -75,-125, -84, -95, -16, -74,
-72, -67, -71
};
#endif
struct proc_info
{
TAILQ_ENTRY(proc_info) info;
@ -393,13 +371,7 @@ main(int argc, char *argv[])
ktrsyscall((struct ktr_syscall *)m, sv_flags);
break;
case KTR_SYSRET:
#if defined(__amd64__) || defined(__i386__)
if ((sv_flags & SV_ABI_MASK) == SV_ABI_LINUX)
linux_ktrsysret((struct ktr_sysret *)m,
sv_flags);
else
#endif
ktrsysret((struct ktr_sysret *)m, sv_flags);
ktrsysret((struct ktr_sysret *)m, sv_flags);
break;
case KTR_NAMEI:
case KTR_SYSCTL:
@ -1366,7 +1338,8 @@ ktrsysret(struct ktr_sysret *ktr, u_int sv_flags)
else if (error == EJUSTRETURN)
printf("JUSTRETURN");
else {
printf("-1 errno %d", ktr->ktr_error);
printf("-1 errno %d", sysdecode_freebsd_to_abi_errno(
syscallabi(sv_flags), error));
if (fancy)
printf(" %s", strerror(ktr->ktr_error));
}
@ -1852,44 +1825,6 @@ ktrfaultend(struct ktr_faultend *ktr)
printf("\n");
}
#if defined(__amd64__) || defined(__i386__)
void
linux_ktrsysret(struct ktr_sysret *ktr, u_int sv_flags)
{
register_t ret = ktr->ktr_retval;
int error = ktr->ktr_error;
syscallname(ktr->ktr_code, sv_flags);
printf(" ");
if (error == 0) {
if (fancy) {
printf("%ld", (long)ret);
if (ret < 0 || ret > 9)
printf("/%#lx", (unsigned long)ret);
} else {
if (decimal)
printf("%ld", (long)ret);
else
printf("%#lx", (unsigned long)ret);
}
} else if (error == ERESTART)
printf("RESTART");
else if (error == EJUSTRETURN)
printf("JUSTRETURN");
else {
if (ktr->ktr_error <= ELAST + 1)
error = abs(bsd_to_linux_errno[ktr->ktr_error]);
else
error = 999;
printf("-1 errno %d", error);
if (fancy)
printf(" %s", strerror(ktr->ktr_error));
}
putchar('\n');
}
#endif
void
usage(void)
{

2
usr.bin/truss/Makefile
View File

@ -2,7 +2,7 @@
NO_WERROR=
PROG= truss
SRCS= cloudabi.c main.c setup.c syscalls.c
SRCS= main.c setup.c syscalls.c
LIBADD= sysdecode

4
usr.bin/truss/aarch64-cloudabi64.c
View File

@ -31,11 +31,9 @@ __FBSDID("$FreeBSD$");
#include <machine/armreg.h>
#include <errno.h>
#include <stdio.h>
#include <sysdecode.h>
#include "cloudabi.h"
#include "truss.h"
static int
@ -74,8 +72,6 @@ aarch64_cloudabi64_fetch_retval(struct trussinfo *trussinfo, long *retval,
retval[0] = regs.x[0];
retval[1] = regs.x[1];
*errorp = (regs.spsr & PSR_C) != 0;
if (*errorp)
retval[0] = cloudabi_convert_errno(retval[0]);
return (0);
}

4
usr.bin/truss/amd64-cloudabi64.c
View File

@ -31,11 +31,9 @@ __FBSDID("$FreeBSD$");
#include <machine/psl.h>
#include <errno.h>
#include <stdio.h>
#include <sysdecode.h>
#include "cloudabi.h"
#include "truss.h"
static int
@ -83,8 +81,6 @@ amd64_cloudabi64_fetch_retval(struct trussinfo *trussinfo, long *retval,
retval[0] = regs.r_rax;
retval[1] = regs.r_rdx;
*errorp = (regs.r_rflags & PSL_C) != 0;
if (*errorp)
retval[0] = cloudabi_convert_errno(retval[0]);
return (0);
}

27
usr.bin/truss/amd64-linux32.c
View File

@ -83,28 +83,12 @@ amd64_linux32_fetch_args(struct trussinfo *trussinfo, u_int narg)
return (0);
}
/*
* Linux syscalls return negative errno's, we do positive and map them
*/
static const int bsd_to_linux_errno[] = {
-0, -1, -2, -3, -4, -5, -6, -7, -8, -9,
-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
-30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
-90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
-6,
};
static int
amd64_linux32_fetch_retval(struct trussinfo *trussinfo, long *retval,
int *errorp)
{
struct reg regs;
lwpid_t tid;
size_t i;
tid = trussinfo->curthread->tid;
if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
@ -117,17 +101,6 @@ amd64_linux32_fetch_retval(struct trussinfo *trussinfo, long *retval,
*errorp = !!(regs.r_rflags & PSL_C);
if (*errorp)
retval[0] = (int)retval[0];
if (*errorp) {
for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
if (retval[0] == bsd_to_linux_errno[i]) {
retval[0] = i;
return (0);
}
}
/* XXX: How to handle unknown errors? */
}
return (0);
}

122
usr.bin/truss/cloudabi.c
View File

@ -1,122 +0,0 @@
/*-
* Copyright (c) 2015 Nuxi, https://nuxi.nl/
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <errno.h>
#include <compat/cloudabi/cloudabi_syscalldefs.h>
#include "cloudabi.h"
long
cloudabi_convert_errno(long error)
{
static const int table[] = {
[CLOUDABI_E2BIG] = E2BIG,
[CLOUDABI_EACCES] = EACCES,
[CLOUDABI_EADDRINUSE] = EADDRINUSE,
[CLOUDABI_EADDRNOTAVAIL] = EADDRNOTAVAIL,
[CLOUDABI_EAFNOSUPPORT] = EAFNOSUPPORT,
[CLOUDABI_EAGAIN] = EAGAIN,
[CLOUDABI_EALREADY] = EALREADY,
[CLOUDABI_EBADF] = EBADF,
[CLOUDABI_EBADMSG] = EBADMSG,
[CLOUDABI_EBUSY] = EBUSY,
[CLOUDABI_ECANCELED] = ECANCELED,
[CLOUDABI_ECHILD] = ECHILD,
[CLOUDABI_ECONNABORTED] = ECONNABORTED,
[CLOUDABI_ECONNREFUSED] = ECONNREFUSED,
[CLOUDABI_ECONNRESET] = ECONNRESET,
[CLOUDABI_EDEADLK] = EDEADLK,
[CLOUDABI_EDESTADDRREQ] = EDESTADDRREQ,
[CLOUDABI_EDOM] = EDOM,
[CLOUDABI_EDQUOT] = EDQUOT,
[CLOUDABI_EEXIST] = EEXIST,
[CLOUDABI_EFAULT] = EFAULT,
[CLOUDABI_EFBIG] = EFBIG,
[CLOUDABI_EHOSTUNREACH] = EHOSTUNREACH,
[CLOUDABI_EIDRM] = EIDRM,
[CLOUDABI_EILSEQ] = EILSEQ,
[CLOUDABI_EINPROGRESS] = EINPROGRESS,
[CLOUDABI_EINTR] = EINTR,
[CLOUDABI_EINVAL] = EINVAL,
[CLOUDABI_EIO] = EIO,
[CLOUDABI_EISCONN] = EISCONN,
[CLOUDABI_EISDIR] = EISDIR,
[CLOUDABI_ELOOP] = ELOOP,
[CLOUDABI_EMFILE] = EMFILE,
[CLOUDABI_EMLINK] = EMLINK,
[CLOUDABI_EMSGSIZE] = EMSGSIZE,
[CLOUDABI_EMULTIHOP] = EMULTIHOP,
[CLOUDABI_ENAMETOOLONG] = ENAMETOOLONG,
[CLOUDABI_ENETDOWN] = ENETDOWN,
[CLOUDABI_ENETRESET] = ENETRESET,
[CLOUDABI_ENETUNREACH] = ENETUNREACH,
[CLOUDABI_ENFILE] = ENFILE,
[CLOUDABI_ENOBUFS] = ENOBUFS,
[CLOUDABI_ENODEV] = ENODEV,
[CLOUDABI_ENOENT] = ENOENT,
[CLOUDABI_ENOEXEC] = ENOEXEC,
[CLOUDABI_ENOLCK] = ENOLCK,
[CLOUDABI_ENOLINK] = ENOLINK,
[CLOUDABI_ENOMEM] = ENOMEM,
[CLOUDABI_ENOMSG] = ENOMSG,
[CLOUDABI_ENOPROTOOPT] = ENOPROTOOPT,
[CLOUDABI_ENOSPC] = ENOSPC,
[CLOUDABI_ENOSYS] = ENOSYS,
[CLOUDABI_ENOTCONN] = ENOTCONN,
[CLOUDABI_ENOTDIR] = ENOTDIR,
[CLOUDABI_ENOTEMPTY] = ENOTEMPTY,
[CLOUDABI_ENOTRECOVERABLE] = ENOTRECOVERABLE,
[CLOUDABI_ENOTSOCK] = ENOTSOCK,
[CLOUDABI_ENOTSUP] = ENOTSUP,
[CLOUDABI_ENOTTY] = ENOTTY,
[CLOUDABI_ENXIO] = ENXIO,
[CLOUDABI_EOVERFLOW] = EOVERFLOW,
[CLOUDABI_EOWNERDEAD] = EOWNERDEAD,
[CLOUDABI_EPERM] = EPERM,
[CLOUDABI_EPIPE] = EPIPE,
[CLOUDABI_EPROTO] = EPROTO,
[CLOUDABI_EPROTONOSUPPORT] = EPROTONOSUPPORT,
[CLOUDABI_EPROTOTYPE] = EPROTOTYPE,
[CLOUDABI_ERANGE] = ERANGE,
[CLOUDABI_EROFS] = EROFS,
[CLOUDABI_ESPIPE] = ESPIPE,
[CLOUDABI_ESRCH] = ESRCH,
[CLOUDABI_ESTALE] = ESTALE,
[CLOUDABI_ETIMEDOUT] = ETIMEDOUT,
[CLOUDABI_ETXTBSY] = ETXTBSY,
[CLOUDABI_EXDEV] = EXDEV,
[CLOUDABI_ENOTCAPABLE] = ENOTCAPABLE,
};
if (error < 0 || error >= nitems(table) || table[error] == 0)
return (error);
return (table[error]);
}

28
usr.bin/truss/cloudabi.h
View File

@ -1,28 +0,0 @@
/*-
* Copyright (c) 2015 Nuxi, https://nuxi.nl/
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
long cloudabi_convert_errno(long);

27
usr.bin/truss/i386-linux.c
View File

@ -83,27 +83,11 @@ i386_linux_fetch_args(struct trussinfo *trussinfo, u_int narg)
return (0);
}
/*
* Linux syscalls return negative errno's, we do positive and map them
*/
static const int bsd_to_linux_errno[] = {
-0, -1, -2, -3, -4, -5, -6, -7, -8, -9,
-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
-30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
-90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
-6,
};
static int
i386_linux_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
{
struct reg regs;
lwpid_t tid;
size_t i;
tid = trussinfo->curthread->tid;
if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
@ -114,17 +98,6 @@ i386_linux_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
retval[0] = regs.r_eax;
retval[1] = regs.r_edx;
*errorp = !!(regs.r_eflags & PSL_C);
if (*errorp) {
for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
if (retval[0] == bsd_to_linux_errno[i]) {
retval[0] = i;
return (0);
}
}
/* XXX: How to handle unknown errors? */
}
return (0);
}

8
usr.bin/truss/syscalls.c
View File

@ -2039,6 +2039,7 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
struct timespec timediff;
struct threadinfo *t;
struct syscall *sc;
int error;
t = trussinfo->curthread;
sc = t->cs.sc;
@ -2053,9 +2054,12 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
print_syscall(trussinfo);
fflush(trussinfo->outfile);
if (errorp)
if (errorp) {
error = sysdecode_abi_to_freebsd_errno(t->proc->abi->abi,
retval[0]);
fprintf(trussinfo->outfile, " ERR#%ld '%s'\n", retval[0],
strerror(retval[0]));
error == INT_MAX ? "Unknown error" : strerror(error));
}
#ifndef __LP64__
else if (sc->ret_type == 2) {
off_t off;