3f2f6cb5e8
New bnds fields will be always present for x86 architecture.
Fixup for compatibility layer 32bits has to be fixed.
It was added the nat_siginfo to serving as intermediate step
between kernel provided siginfo and the fix up routine.
When executing compat_siginfo_from_siginfo or
compat_x32_siginfo_from_siginfo first the buffer read from the kernel are
converted into the nat_signfo for homogenization, then the fields of
nat_siginfo are use to set the compat and compat_x32 siginfo fields.
In other to make this conversion independent of the system where gdb
is compiled the most complete version of the siginfo, named as native
siginfo, is used internally as an intermediate step.
Conversion using nat_siginfo is exemplified below:
compat_siginfo_from_siginfo or compat_x32_siginfo_from_siginfo:
buffer (from the kernel) -> nat_siginfo -> 32 / X32 siginfo
(memcpy) (field by field)
siginfo_from_compat_x32_siginfo or siginfo_from_compat_siginfo:
32 / X32 siginfo -> nat_siginfo -> buffer (to the kernel)
(field by field) (memcpy)
Caveat: No support for MPX on x32.
2016-02-02 Walfred Tedeschi <walfred.tedeschi@intel.com>
gdb/ChangeLog:
* amd64-linux-siginfo.c (nat_siginfo_t, nat_sigval_t, nat_timeval):
New types.
(compat_siginfo): New bound fields added.
(compat_x32_siginfo): New field added.
(cpt_si_addr_lsb): New define.
(compat_siginfo_from_siginfo): Use nat_siginfo.
(siginfo_from_compat_siginfo): Use nat_siginfo.
(compat_x32_siginfo_from_siginfo): Likewise.
(siginfo_from_compat_x32_siginfo): Likewise.
576 lines
13 KiB
C
576 lines
13 KiB
C
/* Low-level siginfo manipulation for amd64.
|
|
|
|
Copyright (C) 2002-2016 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include <signal.h>
|
|
#include "common-defs.h"
|
|
#include "amd64-linux-siginfo.h"
|
|
|
|
/* The nat_* types below define the most complete kernel siginfo type
|
|
known for the architecture, independent of the system/libc headers. */
|
|
|
|
typedef int nat_int_t;
|
|
typedef void* nat_uptr_t;
|
|
|
|
typedef int nat_time_t;
|
|
typedef int nat_timer_t;
|
|
|
|
/* For native 64-bit, clock_t in _sigchld is 64bit aligned at 4 bytes. */
|
|
typedef long __attribute__ ((__aligned__ (4))) nat_clock_t;
|
|
|
|
struct nat_timeval
|
|
{
|
|
nat_time_t tv_sec;
|
|
int tv_usec;
|
|
};
|
|
|
|
typedef union nat_sigval
|
|
{
|
|
nat_int_t sival_int;
|
|
nat_uptr_t sival_ptr;
|
|
} nat_sigval_t;
|
|
|
|
typedef struct nat_siginfo
|
|
{
|
|
int si_signo;
|
|
int si_errno;
|
|
int si_code;
|
|
|
|
union
|
|
{
|
|
int _pad[((128 / sizeof (int)) - 4)];
|
|
/* kill() */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
} _kill;
|
|
|
|
/* POSIX.1b timers */
|
|
struct
|
|
{
|
|
nat_timer_t _tid;
|
|
int _overrun;
|
|
nat_sigval_t _sigval;
|
|
} _timer;
|
|
|
|
/* POSIX.1b signals */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
nat_sigval_t _sigval;
|
|
} _rt;
|
|
|
|
/* SIGCHLD */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
int _status;
|
|
nat_clock_t _utime;
|
|
nat_clock_t _stime;
|
|
} _sigchld;
|
|
|
|
/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
|
|
struct
|
|
{
|
|
nat_uptr_t _addr;
|
|
short int _addr_lsb;
|
|
struct
|
|
{
|
|
nat_uptr_t _lower;
|
|
nat_uptr_t _upper;
|
|
} si_addr_bnd;
|
|
} _sigfault;
|
|
|
|
/* SIGPOLL */
|
|
struct
|
|
{
|
|
int _band;
|
|
int _fd;
|
|
} _sigpoll;
|
|
} _sifields;
|
|
} nat_siginfo_t __attribute__ ((__aligned__ (8)));
|
|
|
|
/* Sanity check for the siginfo structure size. */
|
|
|
|
gdb_static_assert (sizeof (nat_siginfo_t) == sizeof (siginfo_t));
|
|
|
|
/* These types below (compat_*) define a siginfo type that is layout
|
|
compatible with the siginfo type exported by the 32-bit userspace
|
|
support. */
|
|
|
|
typedef int compat_int_t;
|
|
typedef unsigned int compat_uptr_t;
|
|
|
|
typedef int compat_time_t;
|
|
typedef int compat_timer_t;
|
|
typedef int compat_clock_t;
|
|
|
|
struct compat_timeval
|
|
{
|
|
compat_time_t tv_sec;
|
|
int tv_usec;
|
|
};
|
|
|
|
typedef union compat_sigval
|
|
{
|
|
compat_int_t sival_int;
|
|
compat_uptr_t sival_ptr;
|
|
} compat_sigval_t;
|
|
|
|
typedef struct compat_siginfo
|
|
{
|
|
int si_signo;
|
|
int si_errno;
|
|
int si_code;
|
|
|
|
union
|
|
{
|
|
int _pad[((128 / sizeof (int)) - 3)];
|
|
|
|
/* kill() */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
} _kill;
|
|
|
|
/* POSIX.1b timers */
|
|
struct
|
|
{
|
|
compat_timer_t _tid;
|
|
int _overrun;
|
|
compat_sigval_t _sigval;
|
|
} _timer;
|
|
|
|
/* POSIX.1b signals */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
compat_sigval_t _sigval;
|
|
} _rt;
|
|
|
|
/* SIGCHLD */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
int _status;
|
|
compat_clock_t _utime;
|
|
compat_clock_t _stime;
|
|
} _sigchld;
|
|
|
|
/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
|
|
struct
|
|
{
|
|
unsigned int _addr;
|
|
short int _addr_lsb;
|
|
struct
|
|
{
|
|
unsigned int _lower;
|
|
unsigned int _upper;
|
|
} si_addr_bnd;
|
|
} _sigfault;
|
|
|
|
/* SIGPOLL */
|
|
struct
|
|
{
|
|
int _band;
|
|
int _fd;
|
|
} _sigpoll;
|
|
} _sifields;
|
|
} compat_siginfo_t;
|
|
|
|
/* For x32, clock_t in _sigchld is 64bit aligned at 4 bytes. */
|
|
typedef long __attribute__ ((__aligned__ (4))) compat_x32_clock_t;
|
|
|
|
typedef struct compat_x32_siginfo
|
|
{
|
|
int si_signo;
|
|
int si_errno;
|
|
int si_code;
|
|
|
|
union
|
|
{
|
|
int _pad[((128 / sizeof (int)) - 3)];
|
|
|
|
/* kill() */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
} _kill;
|
|
|
|
/* POSIX.1b timers */
|
|
struct
|
|
{
|
|
compat_timer_t _tid;
|
|
int _overrun;
|
|
compat_sigval_t _sigval;
|
|
} _timer;
|
|
|
|
/* POSIX.1b signals */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
compat_sigval_t _sigval;
|
|
} _rt;
|
|
|
|
/* SIGCHLD */
|
|
struct
|
|
{
|
|
unsigned int _pid;
|
|
unsigned int _uid;
|
|
int _status;
|
|
compat_x32_clock_t _utime;
|
|
compat_x32_clock_t _stime;
|
|
} _sigchld;
|
|
|
|
/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
|
|
struct
|
|
{
|
|
unsigned int _addr;
|
|
unsigned int _addr_lsb;
|
|
} _sigfault;
|
|
|
|
/* SIGPOLL */
|
|
struct
|
|
{
|
|
int _band;
|
|
int _fd;
|
|
} _sigpoll;
|
|
} _sifields;
|
|
} compat_x32_siginfo_t __attribute__ ((__aligned__ (8)));
|
|
|
|
/* To simplify usage of siginfo fields. */
|
|
|
|
#define cpt_si_pid _sifields._kill._pid
|
|
#define cpt_si_uid _sifields._kill._uid
|
|
#define cpt_si_timerid _sifields._timer._tid
|
|
#define cpt_si_overrun _sifields._timer._overrun
|
|
#define cpt_si_status _sifields._sigchld._status
|
|
#define cpt_si_utime _sifields._sigchld._utime
|
|
#define cpt_si_stime _sifields._sigchld._stime
|
|
#define cpt_si_ptr _sifields._rt._sigval.sival_ptr
|
|
#define cpt_si_addr _sifields._sigfault._addr
|
|
#define cpt_si_addr_lsb _sifields._sigfault._addr_lsb
|
|
#define cpt_si_band _sifields._sigpoll._band
|
|
#define cpt_si_fd _sifields._sigpoll._fd
|
|
|
|
/* glibc at least up to 2.3.2 doesn't have si_timerid, si_overrun.
|
|
In their place is si_timer1,si_timer2. */
|
|
|
|
#ifndef si_timerid
|
|
#define si_timerid si_timer1
|
|
#endif
|
|
#ifndef si_overrun
|
|
#define si_overrun si_timer2
|
|
#endif
|
|
|
|
/* Convert the system provided siginfo into compatible siginfo. */
|
|
|
|
static void
|
|
compat_siginfo_from_siginfo (compat_siginfo_t *to, siginfo_t *from)
|
|
{
|
|
nat_siginfo_t from_nat;
|
|
|
|
memcpy (&from_nat, from, sizeof (from_nat));
|
|
memset (to, 0, sizeof (*to));
|
|
|
|
to->si_signo = from_nat.si_signo;
|
|
to->si_errno = from_nat.si_errno;
|
|
to->si_code = from_nat.si_code;
|
|
|
|
if (to->si_code == SI_TIMER)
|
|
{
|
|
to->cpt_si_timerid = from_nat.cpt_si_timerid;
|
|
to->cpt_si_overrun = from_nat.cpt_si_overrun;
|
|
to->cpt_si_ptr = (intptr_t) from_nat.cpt_si_ptr;
|
|
}
|
|
else if (to->si_code == SI_USER)
|
|
{
|
|
to->cpt_si_pid = from_nat.cpt_si_pid;
|
|
to->cpt_si_uid = from_nat.cpt_si_uid;
|
|
}
|
|
else if (to->si_code < 0)
|
|
{
|
|
to->cpt_si_pid = from_nat.cpt_si_pid;
|
|
to->cpt_si_uid = from_nat.cpt_si_uid;
|
|
to->cpt_si_ptr = (intptr_t) from_nat.cpt_si_ptr;
|
|
}
|
|
else
|
|
{
|
|
switch (to->si_signo)
|
|
{
|
|
case SIGCHLD:
|
|
to->cpt_si_pid = from_nat.cpt_si_pid;
|
|
to->cpt_si_uid = from_nat.cpt_si_uid;
|
|
to->cpt_si_status = from_nat.cpt_si_status;
|
|
to->cpt_si_utime = from_nat.cpt_si_utime;
|
|
to->cpt_si_stime = from_nat.cpt_si_stime;
|
|
break;
|
|
case SIGILL:
|
|
case SIGFPE:
|
|
case SIGSEGV:
|
|
case SIGBUS:
|
|
to->cpt_si_addr = (intptr_t) from_nat.cpt_si_addr;
|
|
break;
|
|
case SIGPOLL:
|
|
to->cpt_si_band = from_nat.cpt_si_band;
|
|
to->cpt_si_fd = from_nat.cpt_si_fd;
|
|
break;
|
|
default:
|
|
to->cpt_si_pid = from_nat.cpt_si_pid;
|
|
to->cpt_si_uid = from_nat.cpt_si_uid;
|
|
to->cpt_si_ptr = (intptr_t) from_nat.cpt_si_ptr;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Convert the compatible siginfo into system siginfo. */
|
|
|
|
static void
|
|
siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
|
|
{
|
|
nat_siginfo_t to_nat;
|
|
|
|
memset (&to_nat, 0, sizeof (to_nat));
|
|
|
|
to_nat.si_signo = from->si_signo;
|
|
to_nat.si_errno = from->si_errno;
|
|
to_nat.si_code = from->si_code;
|
|
|
|
if (to_nat.si_code == SI_TIMER)
|
|
{
|
|
to_nat.cpt_si_timerid = from->cpt_si_timerid;
|
|
to_nat.cpt_si_overrun = from->cpt_si_overrun;
|
|
to_nat.cpt_si_ptr = (void *) (intptr_t) from->cpt_si_ptr;
|
|
}
|
|
else if (to_nat.si_code == SI_USER)
|
|
{
|
|
to_nat.cpt_si_pid = from->cpt_si_pid;
|
|
to_nat.cpt_si_uid = from->cpt_si_uid;
|
|
}
|
|
if (to_nat.si_code < 0)
|
|
{
|
|
to_nat.cpt_si_pid = from->cpt_si_pid;
|
|
to_nat.cpt_si_uid = from->cpt_si_uid;
|
|
to_nat.cpt_si_ptr = (void *) (intptr_t) from->cpt_si_ptr;
|
|
}
|
|
else
|
|
{
|
|
switch (to_nat.si_signo)
|
|
{
|
|
case SIGCHLD:
|
|
to_nat.cpt_si_pid = from->cpt_si_pid;
|
|
to_nat.cpt_si_uid = from->cpt_si_uid;
|
|
to_nat.cpt_si_status = from->cpt_si_status;
|
|
to_nat.cpt_si_utime = from->cpt_si_utime;
|
|
to_nat.cpt_si_stime = from->cpt_si_stime;
|
|
break;
|
|
case SIGILL:
|
|
case SIGFPE:
|
|
case SIGSEGV:
|
|
case SIGBUS:
|
|
to_nat.cpt_si_addr = (void *) (intptr_t) from->cpt_si_addr;
|
|
to_nat.cpt_si_addr_lsb = (short) from->cpt_si_addr_lsb;
|
|
break;
|
|
case SIGPOLL:
|
|
to_nat.cpt_si_band = from->cpt_si_band;
|
|
to_nat.cpt_si_fd = from->cpt_si_fd;
|
|
break;
|
|
default:
|
|
to_nat.cpt_si_pid = from->cpt_si_pid;
|
|
to_nat.cpt_si_uid = from->cpt_si_uid;
|
|
to_nat.cpt_si_ptr = (void* ) (intptr_t) from->cpt_si_ptr;
|
|
break;
|
|
}
|
|
}
|
|
memcpy (to, &to_nat, sizeof (to_nat));
|
|
}
|
|
|
|
/* Convert the system provided siginfo into compatible x32 siginfo. */
|
|
|
|
static void
|
|
compat_x32_siginfo_from_siginfo (compat_x32_siginfo_t *to,
|
|
siginfo_t *from)
|
|
{
|
|
nat_siginfo_t from_nat;
|
|
|
|
memcpy (&from_nat, from, sizeof (from_nat));
|
|
memset (to, 0, sizeof (*to));
|
|
|
|
to->si_signo = from_nat.si_signo;
|
|
to->si_errno = from_nat.si_errno;
|
|
to->si_code = from_nat.si_code;
|
|
|
|
if (to->si_code == SI_TIMER)
|
|
{
|
|
to->cpt_si_timerid = from_nat.cpt_si_timerid;
|
|
to->cpt_si_overrun = from_nat.cpt_si_overrun;
|
|
to->cpt_si_ptr = (intptr_t) from_nat.cpt_si_ptr;
|
|
}
|
|
else if (to->si_code == SI_USER)
|
|
{
|
|
to->cpt_si_pid = from_nat.cpt_si_pid;
|
|
to->cpt_si_uid = from_nat.cpt_si_uid;
|
|
}
|
|
else if (to->si_code < 0)
|
|
{
|
|
to->cpt_si_pid = from_nat.cpt_si_pid;
|
|
to->cpt_si_uid = from_nat.cpt_si_uid;
|
|
to->cpt_si_ptr = (intptr_t) from_nat.cpt_si_ptr;
|
|
}
|
|
else
|
|
{
|
|
switch (to->si_signo)
|
|
{
|
|
case SIGCHLD:
|
|
to->cpt_si_pid = from_nat.cpt_si_pid;
|
|
to->cpt_si_uid = from_nat.cpt_si_uid;
|
|
to->cpt_si_status = from_nat.cpt_si_status;
|
|
memcpy (&to->cpt_si_utime, &from_nat.cpt_si_utime,
|
|
sizeof (to->cpt_si_utime));
|
|
memcpy (&to->cpt_si_stime, &from_nat.cpt_si_stime,
|
|
sizeof (to->cpt_si_stime));
|
|
break;
|
|
case SIGILL:
|
|
case SIGFPE:
|
|
case SIGSEGV:
|
|
case SIGBUS:
|
|
to->cpt_si_addr = (intptr_t) from_nat.cpt_si_addr;
|
|
break;
|
|
case SIGPOLL:
|
|
to->cpt_si_band = from_nat.cpt_si_band;
|
|
to->cpt_si_fd = from_nat.cpt_si_fd;
|
|
break;
|
|
default:
|
|
to->cpt_si_pid = from_nat.cpt_si_pid;
|
|
to->cpt_si_uid = from_nat.cpt_si_uid;
|
|
to->cpt_si_ptr = (intptr_t) from_nat.cpt_si_ptr;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert the compatible x32 siginfo into system siginfo. */
|
|
static void
|
|
siginfo_from_compat_x32_siginfo (siginfo_t *to,
|
|
compat_x32_siginfo_t *from)
|
|
{
|
|
nat_siginfo_t to_nat;
|
|
|
|
memset (&to_nat, 0, sizeof (to_nat));
|
|
to_nat.si_signo = from->si_signo;
|
|
to_nat.si_errno = from->si_errno;
|
|
to_nat.si_code = from->si_code;
|
|
|
|
if (to_nat.si_code == SI_TIMER)
|
|
{
|
|
to_nat.cpt_si_timerid = from->cpt_si_timerid;
|
|
to_nat.cpt_si_overrun = from->cpt_si_overrun;
|
|
to_nat.cpt_si_ptr = (void *) (intptr_t) from->cpt_si_ptr;
|
|
}
|
|
else if (to_nat.si_code == SI_USER)
|
|
{
|
|
to_nat.cpt_si_pid = from->cpt_si_pid;
|
|
to_nat.cpt_si_uid = from->cpt_si_uid;
|
|
}
|
|
if (to_nat.si_code < 0)
|
|
{
|
|
to_nat.cpt_si_pid = from->cpt_si_pid;
|
|
to_nat.cpt_si_uid = from->cpt_si_uid;
|
|
to_nat.cpt_si_ptr = (void *) (intptr_t) from->cpt_si_ptr;
|
|
}
|
|
else
|
|
{
|
|
switch (to_nat.si_signo)
|
|
{
|
|
case SIGCHLD:
|
|
to_nat.cpt_si_pid = from->cpt_si_pid;
|
|
to_nat.cpt_si_uid = from->cpt_si_uid;
|
|
to_nat.cpt_si_status = from->cpt_si_status;
|
|
memcpy (&to_nat.cpt_si_utime, &from->cpt_si_utime,
|
|
sizeof (to_nat.cpt_si_utime));
|
|
memcpy (&to_nat.cpt_si_stime, &from->cpt_si_stime,
|
|
sizeof (to_nat.cpt_si_stime));
|
|
break;
|
|
case SIGILL:
|
|
case SIGFPE:
|
|
case SIGSEGV:
|
|
case SIGBUS:
|
|
to_nat.cpt_si_addr = (void *) (intptr_t) from->cpt_si_addr;
|
|
break;
|
|
case SIGPOLL:
|
|
to_nat.cpt_si_band = from->cpt_si_band;
|
|
to_nat.cpt_si_fd = from->cpt_si_fd;
|
|
break;
|
|
default:
|
|
to_nat.cpt_si_pid = from->cpt_si_pid;
|
|
to_nat.cpt_si_uid = from->cpt_si_uid;
|
|
to_nat.cpt_si_ptr = (void* ) (intptr_t) from->cpt_si_ptr;
|
|
break;
|
|
}
|
|
}
|
|
memcpy (to, &to_nat, sizeof (to_nat));
|
|
}
|
|
|
|
/* Convert a native/host siginfo object, into/from the siginfo in the
|
|
layout of the inferiors' architecture. Returns true if any
|
|
conversion was done; false otherwise. If DIRECTION is 1, then copy
|
|
from INF to NATIVE. If DIRECTION is 0, then copy from NATIVE to INF. */
|
|
|
|
int
|
|
amd64_linux_siginfo_fixup_common (siginfo_t *native, gdb_byte *inf,
|
|
int direction,
|
|
enum amd64_siginfo_fixup_mode mode)
|
|
{
|
|
if (mode == FIXUP_32)
|
|
{
|
|
gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t));
|
|
|
|
if (direction == 0)
|
|
compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
|
|
else
|
|
siginfo_from_compat_siginfo (native, (struct compat_siginfo *) inf);
|
|
|
|
return 1;
|
|
}
|
|
else if (mode == FIXUP_X32)
|
|
{
|
|
gdb_assert (sizeof (siginfo_t) == sizeof (compat_x32_siginfo_t));
|
|
|
|
if (direction == 0)
|
|
compat_x32_siginfo_from_siginfo ((struct compat_x32_siginfo *) inf,
|
|
native);
|
|
else
|
|
siginfo_from_compat_x32_siginfo (native,
|
|
(struct compat_x32_siginfo *) inf);
|
|
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|