Use __kernel_long_t in struct msgbuf
PATCH 1/1 Use __kernel_long_t in struct msgbuf
X32 msgsnd/msgrcv system calls are the same as x86-64 msgsnd/msgrcv system calls, which use 64-bit integer for long in struct msgbuf . But x32 long is 32 bit. This patch replaces long in struct msgbuf with __kernel_long_t.
--- include/uapi/linux/msg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/msg.h +2 -2
@@ -34,8 +34,8 @@ struct msqid_ds {/* message buffer for msgsnd and msgrcv calls */ struct msgbuf { -long mtype;/* type of message */ -char mtext[1 ];/* message text */ +__kernel_long_t mtype;/* type of message */ +char mtext[1 ];/* message text */ };/* buffer for msgctl calls IPC_INFO, MSG_INFO */
Signature · 1 line
1.8.4.2
Quoted 4 lines · H.J. Lu
X32 msgsnd/msgrcv system calls are the same as x86-64 msgsnd/msgrcv system calls, which use 64-bit integer for long in struct msgbuf . But x32 long is 32 bit. This patch replaces long in struct msgbuf with
__kernel_long_t.
Here is the updated patch which uses __kernel_long_t only if __BITS_PER_LONG == 64.
H.J.
Quoted 1 line
From
a632b2db9ccab7560ae6696fd6e4ca2a42024b7bMon Sep 17 00:00:00 2001
From: "H.J. Lu" <[email protected]>
Date: Wed, 25 Dec 2013 07:55:28 -0800
Subject: [PATCH] Use __kernel_long_t in struct msgbuf
X32 msgsnd/msgrcv system calls are the same as x86-64 msgsnd/msgrcv system calls, which use 64-bit integer for long in struct msgbuf . But x32 long is 32 bit. This patch replaces long in struct msgbuf with __kernel_long_t if __BITS_PER_LONG == 64.
--- include/uapi/linux/msg.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
include/uapi/linux/msg.h +6 -2
@@ -34,8 +34,12 @@ struct msqid_ds {/* message buffer for msgsnd and msgrcv calls */ struct msgbuf { -long mtype;/* type of message */ -char mtext[1 ];/* message text */ +#if __BITS_PER_LONG ==64 +__kernel_long_t mtype;/* type of message */ +#else +long mtype;/* type of message */ +#endif +char mtext[1 ];/* message text */ };/* buffer for msgctl calls IPC_INFO, MSG_INFO */
Signature · 1 line
1.8.4.2