Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info
PATCH 1/1 Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info
Both x32 and x86-64 use the same struct shmid64_ds/shminfo64/shm_info for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in struct shmid64_ds/shminfo64/shm_info.
--- include/uapi/asm-generic/shmbuf.h | 24 ++++++++++++------------ include/uapi/linux/shm.h | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-)
include/uapi/asm-generic/shmbuf.h +12 -12
@@ -39,21 +39,21 @@ struct shmid64_ds {#endif __kernel_pid_t shm_cpid;/* pid of creator */ __kernel_pid_t shm_lpid;/* pid of last operator */ -unsigned long shm_nattch;/* no. of current attaches */ -unsigned long __unused4; - unsigned long __unused5; +__kernel_ulong_t shm_nattch;/* no. of current attaches */ +__kernel_ulong_t __unused4; + __kernel_ulong_t __unused5; };struct shminfo64 { -unsigned long shmmax; -unsigned long shmmin; -unsigned long shmmni; -unsigned long shmseg; -unsigned long shmall; -unsigned long __unused1; -unsigned long __unused2; -unsigned long __unused3; -unsigned long __unused4; +__kernel_ulong_t shmmax; +__kernel_ulong_t shmmin; +__kernel_ulong_t shmmni; +__kernel_ulong_t shmseg; +__kernel_ulong_t shmall; +__kernel_ulong_t __unused1; +__kernel_ulong_t __unused2; +__kernel_ulong_t __unused3; +__kernel_ulong_t __unused4; };#endif /* __ASM_GENERIC_SHMBUF_H */
include/uapi/linux/shm.h +5 -5
@@ -68,11 +68,11 @@ struct shminfo {struct shm_info {int used_ids; -unsigned long shm_tot;/* total allocated shm */ -unsigned long shm_rss;/* total resident shm */ -unsigned long shm_swp;/* total swapped shm */ -unsigned long swap_attempts; -unsigned long swap_successes; +__kernel_ulong_t shm_tot;/* total allocated shm */ +__kernel_ulong_t shm_rss;/* total resident shm */ +__kernel_ulong_t shm_swp;/* total swapped shm */ +__kernel_ulong_t swap_attempts; +__kernel_ulong_t swap_successes; };
Signature · 1 line
1.8.4.2
Quoted 4 lines · H.J. Lu
Both x32 and x86-64 use the same struct shmid64_ds/shminfo64/shm_info for system calls. But x32 long is 32-bit. This patch replaces unsigned long with
__kernel_ulong_tin struct shmid64_ds/shminfo64/shm_info.
Here is the updated patch which uses __kernel_ulong_t only if __BITS_PER_LONG == 64.
H.J.
Quoted 1 line
From
36c74f04735cbb62a33a1c9e8e75350c1b183f1aMon Sep 17 00:00:00 2001
From: "H.J. Lu" <[email protected]>
Date: Wed, 25 Dec 2013 08:51:50 -0800
Subject: [PATCH] Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info
Both x32 and x86-64 use the same struct shmid64_ds/shminfo64/shm_info for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in struct shmid64_ds/shminfo64/shm_info if __BITS_PER_LONG == 64.
--- include/uapi/asm-generic/shmbuf.h | 36 +++++++++++++++++++++++++++--------- include/uapi/linux/shm.h | 14 +++++++++++--- 2 files changed, 38 insertions(+), 12 deletions(-)
include/uapi/asm-generic/shmbuf.h +27 -9
@@ -39,21 +39,39 @@ struct shmid64_ds {#endif __kernel_pid_t shm_cpid;/* pid of creator */ __kernel_pid_t shm_lpid;/* pid of last operator */ +#if __BITS_PER_LONG !=64 unsigned long shm_nattch;/* no. of current attaches */ unsigned long __unused4;unsigned long __unused5; +#else +__kernel_ulong_t shm_nattch;/* no. of current attaches */ +__kernel_ulong_t __unused4; +__kernel_ulong_t __unused5; +#endif };struct shminfo64 { -unsigned long shmmax; -unsigned long shmmin; -unsigned long shmmni; -unsigned long shmseg; -unsigned long shmall; -unsigned long __unused1; -unsigned long __unused2; -unsigned long __unused3; -unsigned long __unused4; +#if __BITS_PER_LONG !=64 +unsigned long shmmax; +unsigned long shmmin; +unsigned long shmmni; +unsigned long shmseg; +unsigned long shmall; +unsigned long __unused1; +unsigned long __unused2; +unsigned long __unused3; +unsigned long __unused4; +#else +__kernel_ulong_t shmmax; +__kernel_ulong_t shmmin; +__kernel_ulong_t shmmni; +__kernel_ulong_t shmseg; +__kernel_ulong_t shmall; +__kernel_ulong_t __unused1; +__kernel_ulong_t __unused2; +__kernel_ulong_t __unused3; +__kernel_ulong_t __unused4; +#endif };#endif /* __ASM_GENERIC_SHMBUF_H */
include/uapi/linux/shm.h +11 -3
@@ -68,11 +68,19 @@ struct shminfo {struct shm_info {int used_ids; -unsigned long shm_tot;/* total allocated shm */ -unsigned long shm_rss;/* total resident shm */ -unsigned long shm_swp;/* total swapped shm */ +#if __BITS_PER_LONG ==64 +__kernel_ulong_t shm_tot;/* total allocated shm */ +__kernel_ulong_t shm_rss;/* total resident shm */ +__kernel_ulong_t shm_swp;/* total swapped shm */ +__kernel_ulong_t swap_attempts; +__kernel_ulong_t swap_successes; +#else +unsigned long shm_tot;/* total allocated shm */ +unsigned long shm_rss;/* total resident shm */ +unsigned long shm_swp;/* total swapped shm */ unsigned long swap_attempts;unsigned long swap_successes; +#endif };
Signature · 1 line
1.8.4.2