diff mbox

arm64: uid16: fix __kernel_old_{gid,uid}_t definitions

Message ID 1401706049-1787-1-git-send-email-will.deacon@arm.com
State Accepted
Commit 34c65c43f1518bf85f93526ad373adc6a683b4c5
Headers show

Commit Message

Will Deacon June 2, 2014, 10:47 a.m. UTC
Whilst native arm64 applications don't have the 16-bit UID/GID syscalls
wired up, compat tasks can still access them. The 16-bit wrappers for
these syscalls use __kernel_old_uid_t and __kernel_old_gid_t, which must
be 16-bit data types to maintain compatibility with the 16-bit UIDs used
by compat applications.

This patch defines 16-bit __kernel_old_{gid,uid}_t types for arm64
instead of using the 32-bit types provided by asm-generic.

Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/include/asm/Kbuild             |  1 -
 arch/arm64/include/uapi/asm/posix_types.h | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/include/uapi/asm/posix_types.h

Comments

Arnd Bergmann June 2, 2014, 11:45 a.m. UTC | #1
On Monday 02 June 2014 11:47:29 Will Deacon wrote:
> Whilst native arm64 applications don't have the 16-bit UID/GID syscalls
> wired up, compat tasks can still access them. The 16-bit wrappers for
> these syscalls use __kernel_old_uid_t and __kernel_old_gid_t, which must
> be 16-bit data types to maintain compatibility with the 16-bit UIDs used
> by compat applications.
> 
> This patch defines 16-bit __kernel_old_{gid,uid}_t types for arm64
> instead of using the 32-bit types provided by asm-generic.
> 
> Signed-off-by: Will Deacon <will.deacon@arm.com>

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

Is this a theoretical problem, or did you actually encounter binaries
with old uid syscalls?

	Arnd
Will Deacon June 2, 2014, 12:35 p.m. UTC | #2
Hi Arnd,

On Mon, Jun 02, 2014 at 12:45:39PM +0100, Arnd Bergmann wrote:
> On Monday 02 June 2014 11:47:29 Will Deacon wrote:
> > Whilst native arm64 applications don't have the 16-bit UID/GID syscalls
> > wired up, compat tasks can still access them. The 16-bit wrappers for
> > these syscalls use __kernel_old_uid_t and __kernel_old_gid_t, which must
> > be 16-bit data types to maintain compatibility with the 16-bit UIDs used
> > by compat applications.
> > 
> > This patch defines 16-bit __kernel_old_{gid,uid}_t types for arm64
> > instead of using the 32-bit types provided by asm-generic.
> > 
> > Signed-off-by: Will Deacon <will.deacon@arm.com>
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>

Cheers!

> Is this a theoretical problem, or did you actually encounter binaries
> with old uid syscalls?

I hit it during an AArch32 LTP run which passes '-1' for some parameters
to the 16-bit flavours of setreuid etc. So I suppose it's theoretical in
the sense that I've only observed the issue within a testsuite as opposed
to a real application.

Will
diff mbox

Patch

diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 83f71b3004a8..f06a9c2d399e 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -30,7 +30,6 @@  generic-y += msgbuf.h
 generic-y += mutex.h
 generic-y += pci.h
 generic-y += poll.h
-generic-y += posix_types.h
 generic-y += preempt.h
 generic-y += resource.h
 generic-y += rwsem.h
diff --git a/arch/arm64/include/uapi/asm/posix_types.h b/arch/arm64/include/uapi/asm/posix_types.h
new file mode 100644
index 000000000000..7985ff60ca3f
--- /dev/null
+++ b/arch/arm64/include/uapi/asm/posix_types.h
@@ -0,0 +1,10 @@ 
+#ifndef __ASM_POSIX_TYPES_H
+#define __ASM_POSIX_TYPES_H
+
+typedef unsigned short __kernel_old_uid_t;
+typedef unsigned short __kernel_old_gid_t;
+#define __kernel_old_uid_t __kernel_old_uid_t
+
+#include <asm-generic/posix_types.h>
+
+#endif /*  __ASM_POSIX_TYPES_H */