mirror of
https://sourceware.org/git/glibc.git
synced 2025-05-31 15:01:17 +03:00
d59f3e5e0f
As noted in <https://sourceware.org/ml/libc-alpha/2018-09/msg00178.html>, glibc's sys/procfs.h headers for microblaze, mips (n64), nios2 and riscv have incorrect types for the pr_uid and pr_gid members of struct elf_prpsinfo (as does the generic Linux version, but nothing uses that). This patch fixes those headers to use unsigned int. The generic Linux version is also fixed, but I do *not* recommend making new architectures use it yet. Rather, I think it should be reworked to look more like a copy of the AArch64 version, but with a new <bits/procfs.h> header included to provide register set definitions; <bits/procfs.h> would then be architecture-specific while many architectures could use the generic <sys/procfs.h>. This fix is deliberately separate from any reworking to use a generic header more, since it's possible there could be uses for backporting this fix but not for backporting a subsequent cleanup. Tested with build-many-glibcs.py. This of course doesn't provide much validation of the structure layout; if the Linux kernel is fixed so that "#include <linux/elfcore.h>" actually compiles with the headers from "make headers_install" (and if the layout in both headers is meant to be the same, whatever ABI we are building for), I have a test that can be added to glibc to check the layout against that from the Linux kernel. [BZ #23649] * sysdeps/unix/sysv/linux/microblaze/sys/procfs.h (struct elf_prpsinfo): Use unsigned int for pr_uid and pr_gid. * sysdeps/unix/sysv/linux/mips/sys/procfs.h (struct elf_prpsinfo): Likewise. * sysdeps/unix/sysv/linux/nios2/sys/procfs.h (struct elf_prpsinfo): Likewise. * sysdeps/unix/sysv/linux/riscv/sys/procfs.h (struct elf_prpsinfo): Likewise. * sysdeps/unix/sysv/linux/sys/procfs.h (struct elf_prpsinfo): Likewise.
115 lines
3.7 KiB
C
115 lines
3.7 KiB
C
/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _SYS_PROCFS_H
|
|
#define _SYS_PROCFS_H 1
|
|
|
|
/* This is somehow modelled after the file of the same name on SysVr4
|
|
systems. It provides a definition of the core file format for ELF
|
|
used on Linux. */
|
|
|
|
#include <features.h>
|
|
#include <signal.h>
|
|
#include <sys/time.h>
|
|
#include <sys/types.h>
|
|
#include <sys/ucontext.h>
|
|
#include <sys/user.h>
|
|
#include <asm/elf.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
struct elf_siginfo
|
|
{
|
|
int si_signo; /* Signal number. */
|
|
int si_code; /* Extra code. */
|
|
int si_errno; /* Errno. */
|
|
};
|
|
|
|
/* Definitions to generate Intel SVR4-like core files. These mostly
|
|
have the same names as the SVR4 types with "elf_" tacked on the
|
|
front to prevent clashes with linux definitions, and the typedef
|
|
forms have been avoided. This is mostly like the SVR4 structure,
|
|
but more Linuxy, with things that Linux does not support and which
|
|
gdb doesn't really use excluded. Fields present but not used are
|
|
marked with "XXX". */
|
|
struct elf_prstatus
|
|
{
|
|
#if 0
|
|
long int pr_flags; /* XXX Process flags. */
|
|
short int pr_why; /* XXX Reason for process halt. */
|
|
short int pr_what; /* XXX More detailed reason. */
|
|
#endif
|
|
struct elf_siginfo pr_info; /* Info associated with signal. */
|
|
short int pr_cursig; /* Current signal. */
|
|
unsigned long int pr_sigpend; /* Set of pending signals. */
|
|
unsigned long int pr_sighold; /* Set of held signals. */
|
|
#if 0
|
|
stack_t pr_altstack; /* Alternate stack info. */
|
|
struct sigaction pr_action; /* Signal action for current sig. */
|
|
#endif
|
|
__pid_t pr_pid;
|
|
__pid_t pr_ppid;
|
|
__pid_t pr_pgrp;
|
|
__pid_t pr_sid;
|
|
struct timeval pr_utime; /* User time. */
|
|
struct timeval pr_stime; /* System time. */
|
|
struct timeval pr_cutime; /* Cumulative user time. */
|
|
struct timeval pr_cstime; /* Cumulative system time. */
|
|
#if 0
|
|
long int pr_instr; /* Current instruction. */
|
|
#endif
|
|
elf_gregset_t pr_reg; /* GP registers. */
|
|
int pr_fpvalid; /* True if math copro being used. */
|
|
};
|
|
|
|
|
|
#define ELF_PRARGSZ (80) /* Number of chars for args */
|
|
|
|
struct elf_prpsinfo
|
|
{
|
|
char pr_state; /* Numeric process state. */
|
|
char pr_sname; /* Char for pr_state. */
|
|
char pr_zomb; /* Zombie. */
|
|
char pr_nice; /* Nice val. */
|
|
unsigned long int pr_flag; /* Flags. */
|
|
unsigned int pr_uid;
|
|
unsigned int pr_gid;
|
|
int pr_pid, pr_ppid, pr_pgrp, pr_sid;
|
|
/* Lots missing */
|
|
char pr_fname[16]; /* Filename of executable. */
|
|
char pr_psargs[ELF_PRARGSZ]; /* Initial part of arg list. */
|
|
};
|
|
|
|
/* Addresses. */
|
|
typedef void *psaddr_t;
|
|
|
|
/* Register sets. Linux has different names. */
|
|
typedef gregset_t prgregset_t;
|
|
typedef fpregset_t prfpregset_t;
|
|
|
|
/* We don't have any differences between processes and threads,
|
|
therefore habe only ine PID type. */
|
|
typedef __pid_t lwpid_t;
|
|
|
|
|
|
typedef struct elf_prstatus prstatus_t;
|
|
typedef struct elf_prpsinfo prpsinfo_t;
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/procfs.h */
|