Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
e35ac62d
Commit
e35ac62d
authored
Aug 03, 2013
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'security-fixes' into fixes
parents
24195cad
8c0cc8a5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
28 deletions
+31
-28
arch/arm/include/asm/elf.h
arch/arm/include/asm/elf.h
+2
-0
arch/arm/kernel/process.c
arch/arm/kernel/process.c
+5
-4
arch/arm/kernel/signal.c
arch/arm/kernel/signal.c
+24
-24
No files found.
arch/arm/include/asm/elf.h
View file @
e35ac62d
...
@@ -130,8 +130,10 @@ struct mm_struct;
...
@@ -130,8 +130,10 @@ struct mm_struct;
extern
unsigned
long
arch_randomize_brk
(
struct
mm_struct
*
mm
);
extern
unsigned
long
arch_randomize_brk
(
struct
mm_struct
*
mm
);
#define arch_randomize_brk arch_randomize_brk
#define arch_randomize_brk arch_randomize_brk
#ifdef CONFIG_MMU
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
struct
linux_binprm
;
struct
linux_binprm
;
int
arch_setup_additional_pages
(
struct
linux_binprm
*
,
int
);
int
arch_setup_additional_pages
(
struct
linux_binprm
*
,
int
);
#endif
#endif
#endif
arch/arm/kernel/process.c
View file @
e35ac62d
...
@@ -474,17 +474,18 @@ const char *arch_vma_name(struct vm_area_struct *vma)
...
@@ -474,17 +474,18 @@ const char *arch_vma_name(struct vm_area_struct *vma)
"[sigpage]"
:
NULL
;
"[sigpage]"
:
NULL
;
}
}
static
struct
page
*
signal_page
;
extern
struct
page
*
get_signal_page
(
void
);
extern
struct
page
*
get_signal_page
(
void
);
int
arch_setup_additional_pages
(
struct
linux_binprm
*
bprm
,
int
uses_interp
)
int
arch_setup_additional_pages
(
struct
linux_binprm
*
bprm
,
int
uses_interp
)
{
{
struct
mm_struct
*
mm
=
current
->
mm
;
struct
mm_struct
*
mm
=
current
->
mm
;
struct
page
*
page
;
unsigned
long
addr
;
unsigned
long
addr
;
int
ret
;
int
ret
;
page
=
get_signal_page
();
if
(
!
signal_page
)
if
(
!
page
)
signal_page
=
get_signal_page
();
if
(
!
signal_page
)
return
-
ENOMEM
;
return
-
ENOMEM
;
down_write
(
&
mm
->
mmap_sem
);
down_write
(
&
mm
->
mmap_sem
);
...
@@ -496,7 +497,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
...
@@ -496,7 +497,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
ret
=
install_special_mapping
(
mm
,
addr
,
PAGE_SIZE
,
ret
=
install_special_mapping
(
mm
,
addr
,
PAGE_SIZE
,
VM_READ
|
VM_EXEC
|
VM_MAYREAD
|
VM_MAYWRITE
|
VM_MAYEXEC
,
VM_READ
|
VM_EXEC
|
VM_MAYREAD
|
VM_MAYWRITE
|
VM_MAYEXEC
,
&
page
);
&
signal_
page
);
if
(
ret
==
0
)
if
(
ret
==
0
)
mm
->
context
.
sigpage
=
addr
;
mm
->
context
.
sigpage
=
addr
;
...
...
arch/arm/kernel/signal.c
View file @
e35ac62d
...
@@ -402,7 +402,8 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
...
@@ -402,7 +402,8 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
__put_user
(
sigreturn_codes
[
idx
+
1
],
rc
+
1
))
__put_user
(
sigreturn_codes
[
idx
+
1
],
rc
+
1
))
return
1
;
return
1
;
if
((
cpsr
&
MODE32_BIT
)
&&
!
IS_ENABLED
(
CONFIG_ARM_MPU
))
{
#ifdef CONFIG_MMU
if
(
cpsr
&
MODE32_BIT
)
{
struct
mm_struct
*
mm
=
current
->
mm
;
struct
mm_struct
*
mm
=
current
->
mm
;
/*
/*
...
@@ -412,7 +413,9 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
...
@@ -412,7 +413,9 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
*/
*/
retcode
=
mm
->
context
.
sigpage
+
signal_return_offset
+
retcode
=
mm
->
context
.
sigpage
+
signal_return_offset
+
(
idx
<<
2
)
+
thumb
;
(
idx
<<
2
)
+
thumb
;
}
else
{
}
else
#endif
{
/*
/*
* Ensure that the instruction cache sees
* Ensure that the instruction cache sees
* the return code written onto the stack.
* the return code written onto the stack.
...
@@ -614,21 +617,19 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
...
@@ -614,21 +617,19 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
return
0
;
return
0
;
}
}
static
struct
page
*
signal_page
;
struct
page
*
get_signal_page
(
void
)
struct
page
*
get_signal_page
(
void
)
{
{
if
(
!
signal_page
)
{
unsigned
long
ptr
;
unsigned
long
ptr
;
unsigned
offset
;
unsigned
offset
;
struct
page
*
page
;
void
*
addr
;
void
*
addr
;
signal_
page
=
alloc_pages
(
GFP_KERNEL
,
0
);
page
=
alloc_pages
(
GFP_KERNEL
,
0
);
if
(
!
signal_
page
)
if
(
!
page
)
return
NULL
;
return
NULL
;
addr
=
page_address
(
signal_
page
);
addr
=
page_address
(
page
);
/* Give the signal return code some randomness */
/* Give the signal return code some randomness */
offset
=
0x200
+
(
get_random_int
()
&
0x7fc
);
offset
=
0x200
+
(
get_random_int
()
&
0x7fc
);
...
@@ -642,7 +643,6 @@ struct page *get_signal_page(void)
...
@@ -642,7 +643,6 @@ struct page *get_signal_page(void)
ptr
=
(
unsigned
long
)
addr
+
offset
;
ptr
=
(
unsigned
long
)
addr
+
offset
;
flush_icache_range
(
ptr
,
ptr
+
sizeof
(
sigreturn_codes
));
flush_icache_range
(
ptr
,
ptr
+
sizeof
(
sigreturn_codes
));
}
return
signal_
page
;
return
page
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment