sparc32: fix struct ipc64_perm type definition

Message ID 20200114132633.3694261-1-arnd@arndb.de
State New
Headers show
Series
  • sparc32: fix struct ipc64_perm type definition
Related show

Commit Message

Arnd Bergmann Jan. 14, 2020, 1:26 p.m.
As discussed in the strace issue tracker, it appears that the sparc32
sysvipc support has been broken for the past 11 years. It was however
working in compat mode, which is how it must have escaped most of the
regular testing.

The problem is that a cleanup patch inadvertently changed the uid/gid
fields in struct ipc64_perm from 32-bit types to 16-bit types in uapi
headers.

Both glibc and uclibc-ng still use the original types, so they should
work fine with compat mode, but not natively.  Change the definitions
to use __kernel_uid32_t and __kernel_gid32_t again.

Fixes: 83c86984bff2 ("sparc: unify ipcbuf.h")
Link: https://github.com/strace/strace/issues/116
Cc: <stable@vger.kernel.org> # v2.6.29
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: "Dmitry V . Levin" <ldv@altlinux.org>
Cc: Rich Felker <dalias@libc.org>
Cc: libc-alpha@sourceware.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 arch/sparc/include/uapi/asm/ipcbuf.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

-- 
2.20.0

Comments

Dmitry V. Levin Jan. 14, 2020, 10:10 p.m. | #1
On Tue, Jan 14, 2020 at 02:26:14PM +0100, Arnd Bergmann wrote:
> As discussed in the strace issue tracker, it appears that the sparc32

> sysvipc support has been broken for the past 11 years. It was however

> working in compat mode, which is how it must have escaped most of the

> regular testing.

> 

> The problem is that a cleanup patch inadvertently changed the uid/gid

> fields in struct ipc64_perm from 32-bit types to 16-bit types in uapi

> headers.

> 

> Both glibc and uclibc-ng still use the original types, so they should

> work fine with compat mode, but not natively.  Change the definitions

> to use __kernel_uid32_t and __kernel_gid32_t again.

> 

> Fixes: 83c86984bff2 ("sparc: unify ipcbuf.h")

> Link: https://github.com/strace/strace/issues/116

> Cc: <stable@vger.kernel.org> # v2.6.29

> Cc: Sam Ravnborg <sam@ravnborg.org>

> Cc: "Dmitry V . Levin" <ldv@altlinux.org>

> Cc: Rich Felker <dalias@libc.org>

> Cc: libc-alpha@sourceware.org

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  arch/sparc/include/uapi/asm/ipcbuf.h | 22 +++++++++++-----------

>  1 file changed, 11 insertions(+), 11 deletions(-)

> 

> diff --git a/arch/sparc/include/uapi/asm/ipcbuf.h b/arch/sparc/include/uapi/asm/ipcbuf.h

> index 5b933a598a33..0ea1240d2ea1 100644

> --- a/arch/sparc/include/uapi/asm/ipcbuf.h

> +++ b/arch/sparc/include/uapi/asm/ipcbuf.h

> @@ -17,19 +17,19 @@

>  

>  struct ipc64_perm

>  {

> -	__kernel_key_t	key;

> -	__kernel_uid_t	uid;

> -	__kernel_gid_t	gid;

> -	__kernel_uid_t	cuid;

> -	__kernel_gid_t	cgid;

> +	__kernel_key_t		key;

> +	__kernel_uid32_t	uid;

> +	__kernel_gid32_t	gid;

> +	__kernel_uid32_t	cuid;

> +	__kernel_gid32_t	cgid;

>  #ifndef __arch64__

> -	unsigned short	__pad0;

> +	unsigned short		__pad0;

>  #endif

> -	__kernel_mode_t	mode;

> -	unsigned short	__pad1;

> -	unsigned short	seq;

> -	unsigned long long __unused1;

> -	unsigned long long __unused2;

> +	__kernel_mode_t		mode;

> +	unsigned short		__pad1;

> +	unsigned short		seq;

> +	unsigned long long	__unused1;

> +	unsigned long long	__unused2;

>  };

>  

>  #endif /* __SPARC_IPCBUF_H */


I think the fix is correct, I also confirm that the part of strace
test suite that checks tracing of 32-bit tracees on sparc64 turns green
again when this patch is applied.

Please add to the commit message that
this bug was found by strace test suite.

Feel free to add
Reported-and-tested-by: Dmitry V. Levin <ldv@altlinux.org>


-- 
ldv
David Miller Jan. 21, 2020, 12:27 p.m. | #2
From: Arnd Bergmann <arnd@arndb.de>

Date: Tue, 14 Jan 2020 14:26:14 +0100

> As discussed in the strace issue tracker, it appears that the sparc32

> sysvipc support has been broken for the past 11 years. It was however

> working in compat mode, which is how it must have escaped most of the

> regular testing.

> 

> The problem is that a cleanup patch inadvertently changed the uid/gid

> fields in struct ipc64_perm from 32-bit types to 16-bit types in uapi

> headers.

> 

> Both glibc and uclibc-ng still use the original types, so they should

> work fine with compat mode, but not natively.  Change the definitions

> to use __kernel_uid32_t and __kernel_gid32_t again.

> 

> Fixes: 83c86984bff2 ("sparc: unify ipcbuf.h")

> Link: https://github.com/strace/strace/issues/116

> Cc: <stable@vger.kernel.org> # v2.6.29

> Cc: Sam Ravnborg <sam@ravnborg.org>

> Cc: "Dmitry V . Levin" <ldv@altlinux.org>

> Cc: Rich Felker <dalias@libc.org>

> Cc: libc-alpha@sourceware.org

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Applied and queued up for -stable, thanks Arnd.

Patch

diff --git a/arch/sparc/include/uapi/asm/ipcbuf.h b/arch/sparc/include/uapi/asm/ipcbuf.h
index 5b933a598a33..0ea1240d2ea1 100644
--- a/arch/sparc/include/uapi/asm/ipcbuf.h
+++ b/arch/sparc/include/uapi/asm/ipcbuf.h
@@ -17,19 +17,19 @@ 
 
 struct ipc64_perm
 {
-	__kernel_key_t	key;
-	__kernel_uid_t	uid;
-	__kernel_gid_t	gid;
-	__kernel_uid_t	cuid;
-	__kernel_gid_t	cgid;
+	__kernel_key_t		key;
+	__kernel_uid32_t	uid;
+	__kernel_gid32_t	gid;
+	__kernel_uid32_t	cuid;
+	__kernel_gid32_t	cgid;
 #ifndef __arch64__
-	unsigned short	__pad0;
+	unsigned short		__pad0;
 #endif
-	__kernel_mode_t	mode;
-	unsigned short	__pad1;
-	unsigned short	seq;
-	unsigned long long __unused1;
-	unsigned long long __unused2;
+	__kernel_mode_t		mode;
+	unsigned short		__pad1;
+	unsigned short		seq;
+	unsigned long long	__unused1;
+	unsigned long long	__unused2;
 };
 
 #endif /* __SPARC_IPCBUF_H */