Use __kernel_ulong_t in struct msqid64_ds
PATCH 1/1 Use __kernel_ulong_t in struct msqid64_ds
Both x32 and x86-64 use the same struct msqid64_ds for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in struct msqid64_ds.
--- include/uapi/asm-generic/msgbuf.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/uapi/asm-generic/msgbuf.h +5 -5
@@ -35,13 +35,13 @@ struct msqid64_ds {#if __BITS_PER_LONG !=64 unsigned long __unused3;#endif -unsigned long msg_cbytes;/* current number of bytes on queue */ -unsigned long msg_qnum;/* number of messages in queue */ -unsigned long msg_qbytes;/* max number of bytes on queue */ +__kernel_ulong_t msg_cbytes;/* current number of bytes on queue */ +__kernel_ulong_t msg_qnum;/* number of messages in queue */ +__kernel_ulong_t msg_qbytes;/* max number of bytes on queue */ __kernel_pid_t msg_lspid;/* pid of last msgsnd */ __kernel_pid_t msg_lrpid;/* last receive pid */ -unsigned long __unused4; - unsigned long __unused5; +__kernel_ulong_t __unused4; + __kernel_ulong_t __unused5; };#endif /* __ASM_GENERIC_MSGBUF_H */
Signature · 1 line
1.8.4.2
Quoted 4 lines · H.J. Lu
Both x32 and x86-64 use the same struct
msqid64_dsfor system calls. But x32 long is 32-bit. This patch replaces unsigned long with__kernel_ulong_tin structmsqid64_ds.
Here is the updated patch which uses __kernel_ulong_t only if __BITS_PER_LONG == 64.
H.J.
Quoted 1 line
From
018f0c350f4a38bb238deb632b79dc909b9490a7Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <[email protected]>
Date: Wed, 25 Dec 2013 08:05:12 -0800
Subject: [PATCH] Use __kernel_ulong_t in struct msqid64_ds
Both x32 and x86-64 use the same struct msqid64_ds for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in struct msqid64_ds if __BITS_PER_LONG == 64.
--- include/uapi/asm-generic/msgbuf.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
include/uapi/asm-generic/msgbuf.h +14 -5
@@ -34,14 +34,23 @@ struct msqid64_ds {__kernel_time_t msg_ctime;/* last change time */ #if __BITS_PER_LONG !=64 unsigned long __unused3; +unsigned long msg_cbytes;/* current number of bytes on queue */ +unsigned long msg_qnum;/* number of messages in queue */ +unsigned long msg_qbytes;/* max number of bytes on queue */ +#else +__kernel_ulong_t msg_cbytes;/* current number of bytes on queue */ +__kernel_ulong_t msg_qnum;/* number of messages in queue */ +__kernel_ulong_t msg_qbytes;/* max number of bytes on queue */ #endif -unsigned long msg_cbytes;/* current number of bytes on queue */ -unsigned long msg_qnum;/* number of messages in queue */ -unsigned long msg_qbytes;/* max number of bytes on queue */ __kernel_pid_t msg_lspid;/* pid of last msgsnd */ __kernel_pid_t msg_lrpid;/* last receive pid */ -unsigned long __unused4; - unsigned long __unused5; +#if __BITS_PER_LONG !=64 +unsigned long __unused4; +unsigned long __unused5; +#else +__kernel_ulong_t __unused4; +__kernel_ulong_t __unused5; +#endif };#endif /* __ASM_GENERIC_MSGBUF_H */
Signature · 1 line
1.8.4.2