X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf-linux-core.h;h=22108a2ab70bc3f27ecea3428e0a3792e7561c76;hb=8380882108b7c11864212eab15eeb5d4c9a3b138;hp=ceb88bd291ecd86dac0402e9a2f5ec2105cdfd27;hpb=de64ce13a78669f094d6909fce51d210e2f9d2c0;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf-linux-core.h b/bfd/elf-linux-core.h index ceb88bd291..22108a2ab7 100644 --- a/bfd/elf-linux-core.h +++ b/bfd/elf-linux-core.h @@ -1,5 +1,5 @@ /* Definitions for PRPSINFO structures under ELF on GNU/Linux. - Copyright (C) 2013-2016 Free Software Foundation, Inc. + Copyright (C) 2013-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -18,21 +18,73 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef ELF_LINUX_PSINFO_H -#define ELF_LINUX_PSINFO_H +#ifndef ELF_LINUX_CORE_H +#define ELF_LINUX_CORE_H -/* The PRPSINFO structures defined below are used by most - architectures, although some of them define their own versions - (like e.g., PPC). */ +/* External 32-bit structure for PRPSINFO. This structure is + ABI-defined, thus we choose to use char arrays here in order to + avoid dealing with different types in different architectures. + + This is the variant for targets which use a 32-bit data type for + UID and GID, as all modern Linux ports do. Some older ports use + a 16-bit data type instead; see below for the alternative variant. + + This structure will ultimately be written in the corefile's note + section, as the PRPSINFO. */ + +struct elf_external_linux_prpsinfo32_ugid32 + { + char pr_state; /* Numeric process state. */ + char pr_sname; /* Char for pr_state. */ + char pr_zomb; /* Zombie. */ + char pr_nice; /* Nice val. */ + char pr_flag[4]; /* Flags. */ + char pr_uid[4]; + char pr_gid[4]; + char pr_pid[4]; + char pr_ppid[4]; + char pr_pgrp[4]; + char pr_sid[4]; + char pr_fname[16] ATTRIBUTE_NONSTRING; /* Filename of executable. */ + char pr_psargs[80] ATTRIBUTE_NONSTRING; /* Initial part of arg list. */ + }; + +/* Helper function to copy an elf_internal_linux_prpsinfo in host + endian to an elf_external_linux_prpsinfo32_ugid32 in target endian. */ + +static inline void +swap_linux_prpsinfo32_ugid32_out + (bfd *obfd, + const struct elf_internal_linux_prpsinfo *from, + struct elf_external_linux_prpsinfo32_ugid32 *to) +{ + bfd_put_8 (obfd, from->pr_state, &to->pr_state); + bfd_put_8 (obfd, from->pr_sname, &to->pr_sname); + bfd_put_8 (obfd, from->pr_zomb, &to->pr_zomb); + bfd_put_8 (obfd, from->pr_nice, &to->pr_nice); + bfd_put_32 (obfd, from->pr_flag, to->pr_flag); + bfd_put_32 (obfd, from->pr_uid, to->pr_uid); + bfd_put_32 (obfd, from->pr_gid, to->pr_gid); + bfd_put_32 (obfd, from->pr_pid, to->pr_pid); + bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid); + bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp); + bfd_put_32 (obfd, from->pr_sid, to->pr_sid); + strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname)); + strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs)); +} /* External 32-bit structure for PRPSINFO. This structure is ABI-defined, thus we choose to use char arrays here in order to avoid dealing with different types in different architectures. + This is the variant for targets which use a 16-bit data type for + UID and GID, as some older Linux ports do. All modern ports use + a 32-bit data type instead; see above for the alternative variant. + This structure will ultimately be written in the corefile's note section, as the PRPSINFO. */ -struct elf_external_linux_prpsinfo32 +struct elf_external_linux_prpsinfo32_ugid16 { char pr_state; /* Numeric process state. */ char pr_sname; /* Char for pr_state. */ @@ -45,83 +97,138 @@ struct elf_external_linux_prpsinfo32 char pr_ppid[4]; char pr_pgrp[4]; char pr_sid[4]; - char pr_fname[16]; /* Filename of executable. */ - char pr_psargs[80]; /* Initial part of arg list. */ + char pr_fname[16] ATTRIBUTE_NONSTRING; /* Filename of executable. */ + char pr_psargs[80] ATTRIBUTE_NONSTRING; /* Initial part of arg list. */ }; -/* Helper macro to swap (properly handling endianess) things from the - `elf_internal_linux_prpsinfo' structure to the - `elf_external_linux_prpsinfo32' structure. - - Note that FROM should be a pointer, and TO should be the explicit - type. */ - -#define LINUX_PRPSINFO32_SWAP_FIELDS(abfd, from, to) \ - do \ - { \ - H_PUT_8 (abfd, from->pr_state, &to.pr_state); \ - H_PUT_8 (abfd, from->pr_sname, &to.pr_sname); \ - H_PUT_8 (abfd, from->pr_zomb, &to.pr_zomb); \ - H_PUT_8 (abfd, from->pr_nice, &to.pr_nice); \ - H_PUT_32 (abfd, from->pr_flag, to.pr_flag); \ - H_PUT_16 (abfd, from->pr_uid, to.pr_uid); \ - H_PUT_16 (abfd, from->pr_gid, to.pr_gid); \ - H_PUT_32 (abfd, from->pr_pid, to.pr_pid); \ - H_PUT_32 (abfd, from->pr_ppid, to.pr_ppid); \ - H_PUT_32 (abfd, from->pr_pgrp, to.pr_pgrp); \ - H_PUT_32 (abfd, from->pr_sid, to.pr_sid); \ - strncpy (to.pr_fname, from->pr_fname, sizeof (to.pr_fname)); \ - strncpy (to.pr_psargs, from->pr_psargs, sizeof (to.pr_psargs)); \ - } while (0) +/* Helper function to copy an elf_internal_linux_prpsinfo in host + endian to an elf_external_linux_prpsinfo32_ugid16 in target endian. */ + +static inline void +swap_linux_prpsinfo32_ugid16_out + (bfd *obfd, + const struct elf_internal_linux_prpsinfo *from, + struct elf_external_linux_prpsinfo32_ugid16 *to) +{ + bfd_put_8 (obfd, from->pr_state, &to->pr_state); + bfd_put_8 (obfd, from->pr_sname, &to->pr_sname); + bfd_put_8 (obfd, from->pr_zomb, &to->pr_zomb); + bfd_put_8 (obfd, from->pr_nice, &to->pr_nice); + bfd_put_32 (obfd, from->pr_flag, to->pr_flag); + bfd_put_16 (obfd, from->pr_uid, to->pr_uid); + bfd_put_16 (obfd, from->pr_gid, to->pr_gid); + bfd_put_32 (obfd, from->pr_pid, to->pr_pid); + bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid); + bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp); + bfd_put_32 (obfd, from->pr_sid, to->pr_sid); + strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname)); + strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs)); +} /* External 64-bit structure for PRPSINFO. This structure is ABI-defined, thus we choose to use char arrays here in order to avoid dealing with different types in different architectures. + This is the variant for targets which use a 32-bit data type for + UID and GID, as most Linux ports do. The SH64 port uses a 16-bit + data type instead; see below for the alternative variant. + This structure will ultimately be written in the corefile's note section, as the PRPSINFO. */ -struct elf_external_linux_prpsinfo64 +struct elf_external_linux_prpsinfo64_ugid32 { char pr_state; /* Numeric process state. */ char pr_sname; /* Char for pr_state. */ char pr_zomb; /* Zombie. */ char pr_nice; /* Nice val. */ - char pr_flag[8]; /* Flags. */ char gap[4]; + char pr_flag[8]; /* Flags. */ char pr_uid[4]; char pr_gid[4]; char pr_pid[4]; char pr_ppid[4]; char pr_pgrp[4]; char pr_sid[4]; - char pr_fname[16]; /* Filename of executable. */ - char pr_psargs[80]; /* Initial part of arg list. */ + char pr_fname[16] ATTRIBUTE_NONSTRING; /* Filename of executable. */ + char pr_psargs[80] ATTRIBUTE_NONSTRING; /* Initial part of arg list. */ + }; + +/* Helper function to copy an elf_internal_linux_prpsinfo in host + endian to an elf_external_linux_prpsinfo64_ugid32 in target endian. */ + +static inline void +swap_linux_prpsinfo64_ugid32_out + (bfd *obfd, + const struct elf_internal_linux_prpsinfo *from, + struct elf_external_linux_prpsinfo64_ugid32 *to) +{ + bfd_put_8 (obfd, from->pr_state, &to->pr_state); + bfd_put_8 (obfd, from->pr_sname, &to->pr_sname); + bfd_put_8 (obfd, from->pr_zomb, &to->pr_zomb); + bfd_put_8 (obfd, from->pr_nice, &to->pr_nice); + bfd_put_64 (obfd, from->pr_flag, to->pr_flag); + bfd_put_32 (obfd, from->pr_uid, to->pr_uid); + bfd_put_32 (obfd, from->pr_gid, to->pr_gid); + bfd_put_32 (obfd, from->pr_pid, to->pr_pid); + bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid); + bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp); + bfd_put_32 (obfd, from->pr_sid, to->pr_sid); + strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname)); + strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs)); +} + +/* External 64-bit structure for PRPSINFO. This structure is + ABI-defined, thus we choose to use char arrays here in order to + avoid dealing with different types in different architectures. + + This is the variant for the SH64 port which uses a 16-bit data + type for UID and GID. Most Linux ports use a 32-bit data type + instead; see above for the alternative variant. + + This structure will ultimately be written in the corefile's note + section, as the PRPSINFO. */ + +struct elf_external_linux_prpsinfo64_ugid16 + { + char pr_state; /* Numeric process state. */ + char pr_sname; /* Char for pr_state. */ + char pr_zomb; /* Zombie. */ + char pr_nice; /* Nice val. */ + char gap[4]; + char pr_flag[8]; /* Flags. */ + char pr_uid[2]; + char pr_gid[2]; + char pr_pid[4]; + char pr_ppid[4]; + char pr_pgrp[4]; + char pr_sid[4]; + char pr_fname[16] ATTRIBUTE_NONSTRING; /* Filename of executable. */ + char pr_psargs[80] ATTRIBUTE_NONSTRING; /* Initial part of arg list. */ }; -/* Helper macro to swap (properly handling endianess) things from the - `elf_internal_linux_prpsinfo' structure to the - `elf_external_linux_prpsinfo64' structure. - - Note that FROM should be a pointer, and TO should be the explicit - type. */ - -#define LINUX_PRPSINFO64_SWAP_FIELDS(abfd, from, to) \ - do \ - { \ - H_PUT_8 (abfd, from->pr_state, &to.pr_state); \ - H_PUT_8 (abfd, from->pr_sname, &to.pr_sname); \ - H_PUT_8 (abfd, from->pr_zomb, &to.pr_zomb); \ - H_PUT_8 (abfd, from->pr_nice, &to.pr_nice); \ - H_PUT_64 (abfd, from->pr_flag, to.pr_flag); \ - H_PUT_32 (abfd, from->pr_uid, to.pr_uid); \ - H_PUT_32 (abfd, from->pr_gid, to.pr_gid); \ - H_PUT_32 (abfd, from->pr_pid, to.pr_pid); \ - H_PUT_32 (abfd, from->pr_ppid, to.pr_ppid); \ - H_PUT_32 (abfd, from->pr_pgrp, to.pr_pgrp); \ - H_PUT_32 (abfd, from->pr_sid, to.pr_sid); \ - strncpy (to.pr_fname, from->pr_fname, sizeof (to.pr_fname)); \ - strncpy (to.pr_psargs, from->pr_psargs, sizeof (to.pr_psargs)); \ - } while (0) +/* Helper function to copy an elf_internal_linux_prpsinfo in host + endian to an elf_external_linux_prpsinfo64_ugid16 in target endian. */ + +static inline void +swap_linux_prpsinfo64_ugid16_out + (bfd *obfd, + const struct elf_internal_linux_prpsinfo *from, + struct elf_external_linux_prpsinfo64_ugid16 *to) +{ + bfd_put_8 (obfd, from->pr_state, &to->pr_state); + bfd_put_8 (obfd, from->pr_sname, &to->pr_sname); + bfd_put_8 (obfd, from->pr_zomb, &to->pr_zomb); + bfd_put_8 (obfd, from->pr_nice, &to->pr_nice); + bfd_put_64 (obfd, from->pr_flag, to->pr_flag); + bfd_put_16 (obfd, from->pr_uid, to->pr_uid); + bfd_put_16 (obfd, from->pr_gid, to->pr_gid); + bfd_put_32 (obfd, from->pr_pid, to->pr_pid); + bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid); + bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp); + bfd_put_32 (obfd, from->pr_sid, to->pr_sid); + strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname)); + strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs)); +} #endif