about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2015-07-09 09:39:51 +0100
committerSzabolcs Nagy <nsz@port70.net>2015-07-09 09:39:51 +0100
commit14d623bcd178d336b47fdb4f0c973720d56d907c (patch)
tree2d53c34cd2a651982d4974cb95c920c58f1c829f
parent95af4cffdb730b18ee1478609f1042929a72b361 (diff)
downloadglibc-14d623bcd178d336b47fdb4f0c973720d56d907c.tar.gz
glibc-14d623bcd178d336b47fdb4f0c973720d56d907c.tar.xz
glibc-14d623bcd178d336b47fdb4f0c973720d56d907c.zip
[AArch64][BZ 18400] fix elf_prpsinfo in procfs.h
Kernel uses int pr_uid, pr_gid, but glibc used unsigned short.

This is an ABI breaking change, but the size and alignment of
the struct and the layout of other members is not changed and
there is no known usage of pr_uid and pr_gid so it is expected
to be safe.

	[BZ #18400]
	* sysdeps/unix/sysv/linux/aarch64/sys/procfs.h (struct elf_prpsinfo):
	Fix pr_uid and pr_gid members.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/sys/procfs.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 71ec1f3c2e..413a1c80a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* sysdeps/unix/sysv/linux/aarch64/sys/procfs.h (struct elf_prpsinfo):
+	Fix pr_uid and pr_gid members.
+
 2015-07-08  Roland McGrath  <roland@hack.frob.com>
 
 	[BZ #18383]
diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h b/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
index cf5e76c7f5..ecc65ab0cd 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
@@ -91,8 +91,8 @@ struct elf_prpsinfo
     char pr_zomb;			/* Zombie.  */
     char pr_nice;			/* Nice val.  */
     unsigned long int pr_flag;		/* Flags.  */
-    unsigned short int pr_uid;
-    unsigned short int pr_gid;
+    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.  */