diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-11 19:18:28 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-11 19:18:28 +0100 |
| commit | c2172ce2303051764829d4958bd50a11ada0590f (patch) | |
| tree | c465594496072249d2ad8ee4642f7c5dcd57e139 /arch/arm/mm/abort-lv4t.S | |
| parent | a4a5a7379e4ca03c192b732d61e446994eb67bbc (diff) | |
| parent | 0b61f2c0f37983c98ed4207f3f5e265938371b68 (diff) | |
| download | linux-c2172ce2303051764829d4958bd50a11ada0590f.tar.bz2 | |
Merge branch 'uaccess' into fixes
Diffstat (limited to 'arch/arm/mm/abort-lv4t.S')
| -rw-r--r-- | arch/arm/mm/abort-lv4t.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/abort-lv4t.S b/arch/arm/mm/abort-lv4t.S index f3982580c273..6d8e8e3365d1 100644 --- a/arch/arm/mm/abort-lv4t.S +++ b/arch/arm/mm/abort-lv4t.S @@ -26,6 +26,7 @@ ENTRY(v4t_late_abort) #endif bne .data_thumb_abort ldr r8, [r4] @ read arm instruction + uaccess_disable ip @ disable userspace access tst r8, #1 << 20 @ L = 1 -> write? orreq r1, r1, #1 << 11 @ yes. and r7, r8, #15 << 24 @@ -155,6 +156,7 @@ ENTRY(v4t_late_abort) .data_thumb_abort: ldrh r8, [r4] @ read instruction + uaccess_disable ip @ disable userspace access tst r8, #1 << 11 @ L = 1 -> write? orreq r1, r1, #1 << 8 @ yes and r7, r8, #15 << 12 |