
Fix commit 70a38d42c5
("New entry points for writing Linux NT_PRPSINFO
notes."), <https://sourceware.org/ml/binutils/2013-02/msg00023.html>,
and move the padding of the `elf_external_linux_prpsinfo64' structure to
match the corresponding 64-bit Linux kernel `elf_prpsinfo' structure.
The 64-bit kernel structure is defined as follows:
(gdb) ptype struct elf_prpsinfo
type = struct elf_prpsinfo {
char pr_state;
char pr_sname;
char pr_zomb;
char pr_nice;
unsigned long pr_flag;
__kernel_uid_t pr_uid;
__kernel_gid_t pr_gid;
pid_t pr_pid;
pid_t pr_ppid;
pid_t pr_pgrp;
pid_t pr_sid;
char pr_fname[16];
char pr_psargs[80];
}
(gdb) print /x &((struct elf_prpsinfo *)0)->pr_nice
$1 = 0x3
(gdb) print /x &((struct elf_prpsinfo *)0)->pr_flag
$2 = 0x8
(gdb) print /x &((struct elf_prpsinfo *)0)->pr_uid
$3 = 0x10
(gdb) print sizeof(((struct elf_prpsinfo *)0)->pr_flag)
$4 = 8
(gdb)
with implicit padding present before the `pr_flag' member, to correctly
align it to a multiple of 8. Conversely `elf_external_linux_prpsinfo64'
has padding after its `pr_flag' member:
(top-gdb) ptype struct elf_external_linux_prpsinfo64
type = struct elf_external_linux_prpsinfo64 {
char pr_state;
char pr_sname;
char pr_zomb;
char pr_nice;
char pr_flag[8];
char gap[4];
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];
char pr_psargs[80];
}
(top-gdb) print /x &((struct elf_external_linux_prpsinfo64 *)0)->pr_nice
$1 = 0x3
(top-gdb) print /x &((struct elf_external_linux_prpsinfo64 *)0)->pr_flag
$2 = 0x4
(top-gdb) print /x &((struct elf_external_linux_prpsinfo64 *)0)->pr_uid
$3 = 0x10
(top-gdb)
and consequently `pr_flag' is misplaced. Move `gap' ahead of `pr_flag'
then.
bfd/
* elf-linux-core.h (elf_external_linux_prpsinfo64): Move the
`gap' member ahead of `pr_flag'.
123 lines
4.5 KiB
C
123 lines
4.5 KiB
C
/* Definitions for PRPSINFO structures under ELF on GNU/Linux.
|
|
Copyright (C) 2013-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
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, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
#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 structure will ultimately be written in the corefile's note
|
|
section, as the PRPSINFO. */
|
|
|
|
struct elf_external_linux_prpsinfo32
|
|
{
|
|
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[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]; /* Filename of executable. */
|
|
char pr_psargs[80]; /* Initial part of arg list. */
|
|
};
|
|
|
|
/* Helper function to copy an elf_internal_linux_prpsinfo in host
|
|
endian to an elf_external_linux_prpsinfo32 in target endian. */
|
|
|
|
static inline void
|
|
swap_linux_prpsinfo32_out (bfd *obfd,
|
|
const struct elf_internal_linux_prpsinfo *from,
|
|
struct elf_external_linux_prpsinfo32 *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 structure will ultimately be written in the corefile's note
|
|
section, as the PRPSINFO. */
|
|
|
|
struct elf_external_linux_prpsinfo64
|
|
{
|
|
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[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. */
|
|
};
|
|
|
|
/* Helper function to copy an elf_internal_linux_prpsinfo in host
|
|
endian to an elf_external_linux_prpsinfo64 in target endian. */
|
|
|
|
static inline void
|
|
swap_linux_prpsinfo64_out (bfd *obfd,
|
|
const struct elf_internal_linux_prpsinfo *from,
|
|
struct elf_external_linux_prpsinfo64 *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));
|
|
}
|
|
|
|
#endif
|