Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tomeu Vizoso
linux
Commits
e1f02037
Commit
e1f02037
authored
11 years ago
by
Russell King
Browse files
Options
Downloads
Plain Diff
Merge branch 'security-fixes' into fixes
parents
4f9b4fb7
ac124504
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
arch/arm/kernel/fiq.c
+2
-1
2 additions, 1 deletion
arch/arm/kernel/fiq.c
arch/arm/mm/Kconfig
+6
-3
6 additions, 3 deletions
arch/arm/mm/Kconfig
with
8 additions
and
4 deletions
arch/arm/kernel/fiq.c
+
2
−
1
View file @
e1f02037
...
@@ -89,7 +89,8 @@ void set_fiq_handler(void *start, unsigned int length)
...
@@ -89,7 +89,8 @@ void set_fiq_handler(void *start, unsigned int length)
memcpy
(
base
+
offset
,
start
,
length
);
memcpy
(
base
+
offset
,
start
,
length
);
if
(
!
cache_is_vipt_nonaliasing
())
if
(
!
cache_is_vipt_nonaliasing
())
flush_icache_range
(
base
+
offset
,
offset
+
length
);
flush_icache_range
((
unsigned
long
)
base
+
offset
,
offset
+
length
);
flush_icache_range
(
0xffff0000
+
offset
,
0xffff0000
+
offset
+
length
);
flush_icache_range
(
0xffff0000
+
offset
,
0xffff0000
+
offset
+
length
);
}
}
...
...
This diff is collapsed.
Click to expand it.
arch/arm/mm/Kconfig
+
6
−
3
View file @
e1f02037
...
@@ -809,15 +809,18 @@ config KUSER_HELPERS
...
@@ -809,15 +809,18 @@ config KUSER_HELPERS
the CPU type fitted to the system. This permits binaries to be
the CPU type fitted to the system. This permits binaries to be
run on ARMv4 through to ARMv7 without modification.
run on ARMv4 through to ARMv7 without modification.
See Documentation/arm/kernel_user_helpers.txt for details.
However, the fixed address nature of these helpers can be used
However, the fixed address nature of these helpers can be used
by ROP (return orientated programming) authors when creating
by ROP (return orientated programming) authors when creating
exploits.
exploits.
If all of the binaries and libraries which run on your platform
If all of the binaries and libraries which run on your platform
are built specifically for your platform, and make no use of
are built specifically for your platform, and make no use of
these helpers, then you can turn this option off. However,
these helpers, then you can turn this option off to hinder
when such an binary or library is run, it will receive a SIGILL
such exploits. However, in that case, if a binary or library
signal, which will terminate the program.
relying on those helpers is run, it will receive a SIGILL signal,
which will terminate the program.
Say N here only if you are absolutely certain that you do not
Say N here only if you are absolutely certain that you do not
need these helpers; otherwise, the safe option is to say Y.
need these helpers; otherwise, the safe option is to say Y.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment