Skip to contentSkip to conversation

arm64: fix missing include in asm uaccess.h

PATCH In review Ansuel Smith 3 participants 6 messages Nov 11, 2020 – Nov 13, 2020

Subsystems (6)
Network drivers PowerPC arm64 s390 +2 more subsystems
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: fix missing include in asm uaccess.h

Fix a compilation error as PF_KTHREAD is defined in linux/sched.h and this is missing.

Fixes df325e05a682 ("arm64: Validate tagged addresses in access_ok()

called from kernel threads")

---
 arch/arm64/include/asm/uaccess.h | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/include/asm/uaccess.h +2 -0
index 991dd5f031e4..51a4f63f464a 100644
@@ -7,6 +7,8 @@
 #ifndef __ASM_UACCESS_H
 #define __ASM_UACCESS_H
 
+#include <linux/sched.h>
+
 #include <asm/alternative.h>
 #include <asm/kernel-pgtable.h>
 #include <asm/sysreg.h>
Signature · 1 line
2.28.0
#1 lore raw
Quoted 15 lines · Ansuel Smith

Fix a compilation error as PF_KTHREAD is defined in linux/sched.h and this is missing.

Fixes df325e05a682 ("arm64: Validate tagged addresses in access_ok()

called from kernel threads")

---
 arch/arm64/include/asm/uaccess.h | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/include/asm/uaccess.h +0 -0
index 991dd5f031e4..51a4f63f464a 100644

arch/arm64/include/asm/uaccess.h line 14

Quoted 8 lines
arch/arm64/include/asm/uaccess.h +2 -0
@@ -7,6 +7,8 @@
 #ifndef __ASM_UACCESS_H
 #define __ASM_UACCESS_H
 
+#include <linux/sched.h>
+
 #include <asm/alternative.h>
 #include <asm/kernel-pgtable.h>
 #include <asm/sysreg.h>

NAK. The real bug is in arch/arm64/include/asm/asm-prototypes.h - it has no business pulling asm/uaccess.h

Just include linux/uaccess.h instead.

#2 lore raw
Quoted 28 lines · Al Viro
Quoted 15 lines · Ansuel Smith

Fix a compilation error as PF_KTHREAD is defined in linux/sched.h and this is missing.

Fixes df325e05a682 ("arm64: Validate tagged addresses in access_ok()

called from kernel threads")

---
 arch/arm64/include/asm/uaccess.h | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/include/asm/uaccess.h +0 -0
index 991dd5f031e4..51a4f63f464a 100644

arch/arm64/include/asm/uaccess.h line 14

Quoted 8 lines
arch/arm64/include/asm/uaccess.h +2 -0
@@ -7,6 +7,8 @@
 #ifndef __ASM_UACCESS_H
 #define __ASM_UACCESS_H
 
+#include <linux/sched.h>
+
 #include <asm/alternative.h>
 #include <asm/kernel-pgtable.h>
 #include <asm/sysreg.h>

NAK. The real bug is in arch/arm64/include/asm/asm-prototypes.h - it has no business pulling asm/uaccess.h

Quoted 1 line

Just include linux/uaccess.h instead.

BTW,

$ grep -n uaccess.h `find -name asm-prototypes.h`
./arch/alpha/include/asm/asm-prototypes.h:7:#include <linux/uaccess.h>
./arch/arm64/include/asm/asm-prototypes.h:18:#include <asm/uaccess.h>
./arch/ia64/include/asm/asm-prototypes.h:12:#include <linux/uaccess.h>
./arch/mips/include/asm/asm-prototypes.h:6:#include <linux/uaccess.h>
./arch/powerpc/include/asm/asm-prototypes.h:14:#include <linux/uaccess.h>
./arch/sparc/include/asm/asm-prototypes.h:9:#include <linux/uaccess.h>
./arch/x86/include/asm/asm-prototypes.h:3:#include <linux/uaccess.h>

Spot the irregularity...

While we are at it,

$ git grep -n -w '#.*include.*asm/uaccess.h'
arch/arm64/include/asm/asm-prototypes.h:18:#include <asm/uaccess.h>
arch/nds32/math-emu/fpuemu.c:5:#include <asm/uaccess.h>
arch/powerpc/kvm/book3s_xive_native.c:15:#include <asm/uaccess.h>
arch/powerpc/mm/book3s64/radix_pgtable.c:30:#include <asm/uaccess.h>
drivers/s390/net/ctcm_mpc.c:50:#include <linux/uaccess.h>       /* instead of <asm/uaccess.h> ok ? */
include/linux/uaccess.h:11:#include <asm/uaccess.h>

The last one is the only such include that should exist; drivers/s390 one is obviously a false positive. And IMO the right thing to do is to replace the remaining arch/* instances with includes of linux/uaccess.h.

All of those are asking for trouble; any change moving e.g. a common variant of some primitive into linux/uaccess.h might end up breaking those.

#3 lore raw

R: [PATCH] arm64: fix missing include in asm uaccess.h

Quoted 44 lines · Al Viro
Quoted 12 lines · Ansuel Smith

Review

Quoted 11 lines

Fix a compilation error as PF_KTHREAD is defined in linux/sched.h and this is missing.

Fixes df325e05a682 ("arm64: Validate tagged addresses in access_ok()

called from kernel threads")

---
 arch/arm64/include/asm/uaccess.h | 2 ++
 1 file changed, 2 insertions(+)
(quoted diff) +0 -0

b/arch/arm64/include/asm/uaccess.h

Quoted 16 lines

arch/arm64/include/asm/uaccess.h line 14

Quoted 12 lines

index 991dd5f031e4..51a4f63f464a 100644

arch/arm64/include/asm/uaccess.h +2 -0
@@ -7,6 +7,8 @@
 #ifndef __ASM_UACCESS_H
 #define __ASM_UACCESS_H
 
+#include <linux/sched.h>
+
 #include <asm/alternative.h>
 #include <asm/kernel-pgtable.h>
 #include <asm/sysreg.h>

NAK. The real bug is in arch/arm64/include/asm/asm-prototypes.h - it has no business pulling asm/uaccess.h

Quoted 1 line

Just include linux/uaccess.h instead.

BTW,

$ grep -n uaccess.h `find -name asm-prototypes.h`
./arch/alpha/include/asm/asm-prototypes.h:7:#include <linux/uaccess.h>
./arch/arm64/include/asm/asm-prototypes.h:18:#include <asm/uaccess.h>
./arch/ia64/include/asm/asm-prototypes.h:12:#include <linux/uaccess.h>
./arch/mips/include/asm/asm-prototypes.h:6:#include <linux/uaccess.h>
./arch/powerpc/include/asm/asm-prototypes.h:14:#include <linux/uaccess.h>
./arch/sparc/include/asm/asm-prototypes.h:9:#include <linux/uaccess.h>
./arch/x86/include/asm/asm-prototypes.h:3:#include <linux/uaccess.h>

Spot the irregularity...

Quoted 7 lines

While we are at it,

$ git grep -n -w '#.*include.*asm/uaccess.h'
arch/arm64/include/asm/asm-prototypes.h:18:#include <asm/uaccess.h>
arch/nds32/math-emu/fpuemu.c:5:#include <asm/uaccess.h>
arch/powerpc/kvm/book3s_xive_native.c:15:#include <asm/uaccess.h>
arch/powerpc/mm/book3s64/radix_pgtable.c:30:#include <asm/uaccess.h>
drivers/s390/net/ctcm_mpc.c:50:#include <linux/uaccess.h>       /* instead

of

Quoted 10 lines

<asm/uaccess.h> ok ? */ include/linux/uaccess.h:11:#include <asm/uaccess.h>

The last one is the only such include that should exist; drivers/s390 one is obviously a false positive. And IMO the right thing to do is to replace the remaining arch/* instances with includes of linux/uaccess.h.

All of those are asking for trouble; any change moving e.g. a common variant of some primitive into linux/uaccess.h might end up breaking those.

Thx for the quick response. I found this error while working on a qcom driver that
use this include. I can confirm that by using linux/uaccess.h the problem is solved.

#4 lore raw

Re: R: [PATCH] arm64: fix missing include in asm uaccess.h

Quoted 7 lines · On Wed, 11 Nov 2020 02:19:48 +0100 <[email protected]> wrote:
Quoted 7 lines

<asm/uaccess.h> ok ? */ include/linux/uaccess.h:11:#include <asm/uaccess.h>

The last one is the only such include that should exist; drivers/s390 one is obviously a false positive. And IMO the right thing to do is to replace the remaining arch/* instances with includes of linux/uaccess.h.

Quoted 8 lines
Quoted 3 lines

All of those are asking for trouble; any change moving e.g. a common variant of some primitive into linux/uaccess.h might end up breaking those.

Thx for the quick response. I found this error while working on a qcom driver that
use this include. I can confirm that by using linux/uaccess.h the problem is solved.

Thanks, all.

I queued up the below for sending to Linus Real Soon Now. Please note that I added the cc:stable, because the offending df325e05a6 ("arm64:
Validate tagged addresses in access_ok() called from kernel threads") had a cc:stable.

From: Ansuel Smith <[email protected]>
Subject: arm64: fix missing include in asm/uaccess.h

Fix a compilation error as PF_KTHREAD is defined in linux/sched.h and this is missing.

[[email protected]: use linux/uaccess.h]
Fixes df325e05a682 ("arm64: Validate tagged addresses in access_ok() called from kernel threads")
Cc Will Deacon <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Pavel Tatashin <[email protected]>

---

 arch/arm64/include/asm/uaccess.h |    2 ++
 1 file changed, 2 insertions(+)
arch/arm64/include/asm/uaccess.h renamed from arch/arm64/include/asm/uaccess.h~arm64-fix-missing-include-in-asm-uaccessh +2 -0
@@ -7,6 +7,8 @@
 #ifndef __ASM_UACCESS_H
 #define __ASM_UACCESS_H
 
+#include <linux/uaccess.h>
+
 #include <asm/alternative.h>
 #include <asm/kernel-pgtable.h>
 #include <asm/sysreg.h>

_

#5 lore raw

Re: R: [PATCH] arm64: fix missing include in asm uaccess.h

Quoted 19 lines · Andrew Morton
[[email protected]: use linux/uaccess.h]
Fixes df325e05a682 ("arm64: Validate tagged addresses in access_ok() called from kernel threads")
Cc Will Deacon <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Pavel Tatashin <[email protected]>

---

 arch/arm64/include/asm/uaccess.h |    2 ++
 1 file changed, 2 insertions(+)

arch/arm64/include/asm/uaccess.h line 14

Quoted 8 lines
arch/arm64/include/asm/uaccess.h renamed from arch/arm64/include/asm/uaccess.h~arm64-fix-missing-include-in-asm-uaccessh +2 -0
@@ -7,6 +7,8 @@
 #ifndef __ASM_UACCESS_H
 #define __ASM_UACCESS_H
 
+#include <linux/uaccess.h>
+
 #include <asm/alternative.h>
 #include <asm/kernel-pgtable.h>
 #include <asm/sysreg.h>

Huh? You are creating a loop for no reason whatsoever. Again,
* asm/uaccess.h should be included only by linux/uaccess.h
* asm/uaccess.h should NOT, NOT, NOT! include linux/uaccess.h
* any place other than linux/uaccess.h that includes asm/uaccess.h,
should include linux/uaccess.h instead (assuming it really needs either of those).

The last one applies to arch/arm64/include/asm-prototypes.h - the include of asm/uaccess.h there should be replaced with include of linux/uaccess.h.

arch/arm64/include/asm/asm-prototypes.h +1 -1
index 1c9a3a0c5fa5..80077350dbc5 100644
@@ -15,7 +15,7 @@
 #include <asm/ftrace.h>
 #include <asm/page.h>
 #include <asm/string.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include <asm-generic/asm-prototypes.h>
 
arch/nds32/math-emu/fpuemu.c +1 -1
index 46558a15c0dc..6fabf75c19b3 100644
@@ -2,7 +2,7 @@
 // Copyright (C) 2005-2018 Andes Technology Corporation
 
 #include <asm/bitfield.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/sfp-machine.h>
 #include <asm/fpuemu.h>
 #include <asm/nds32_fpu_inst.h>
arch/powerpc/kvm/book3s_xive_native.c +1 -1
index d0c2db0e07fa..3a4468cd21b9 100644
@@ -12,7 +12,7 @@
 #include <linux/spinlock.h>
 #include <linux/delay.h>
 #include <linux/file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/kvm_book3s.h>
 #include <asm/kvm_ppc.h>
 #include <asm/hvcall.h>
arch/powerpc/mm/book3s64/radix_pgtable.c +1 -1
index 3adcf730f478..93aaeaf24151 100644
@@ -27,7 +27,7 @@
 #include <asm/sections.h>
 #include <asm/smp.h>
 #include <asm/trace.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/ultravisor.h>
 
 #include <trace/events/thp.h>
drivers/s390/net/ctcm_mpc.c +1 -1
index 85a1a4533cbe..88b74ddd88f0 100644
@@ -47,7 +47,7 @@
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 #include <linux/bitops.h>	/* instead of <asm/bitops.h> ok ? */
-#include <linux/uaccess.h>	/* instead of <asm/uaccess.h> ok ? */
+#include <linux/uaccess.h>
 #include <linux/wait.h>
 #include <linux/moduleparam.h>
 #include <asm/idals.h>
include/linux/uaccess.h +5 -0
index c7c6e8b8344d..3743957e207f 100644
@@ -8,6 +8,11 @@
 #include <linux/sched.h>
 #include <linux/thread_info.h>
 
+/*
+ * NOTE: This is the one and only place that has any business trying
+ * to include asm/uaccess.h; if you see such include anywhere else,
+ * kill it.
+ */
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_SET_FS