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
8b6c3309
Commit
8b6c3309
authored
Apr 21, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h8300: don't change blocked signals' mask if setting frame up fails
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
9ef461ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
arch/h8300/kernel/signal.c
arch/h8300/kernel/signal.c
+11
-7
No files found.
arch/h8300/kernel/signal.c
View file @
8b6c3309
...
...
@@ -304,7 +304,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
return
(
void
*
)((
usp
-
frame_size
)
&
-
8UL
);
}
static
void
setup_frame
(
int
sig
,
struct
k_sigaction
*
ka
,
static
int
setup_frame
(
int
sig
,
struct
k_sigaction
*
ka
,
sigset_t
*
set
,
struct
pt_regs
*
regs
)
{
struct
sigframe
*
frame
;
...
...
@@ -365,13 +365,14 @@ static void setup_frame (int sig, struct k_sigaction *ka,
regs
->
er1
=
(
unsigned
long
)
&
(
frame
->
sc
);
regs
->
er5
=
current
->
mm
->
start_data
;
/* GOT base */
return
;
return
0
;
give_sigsegv:
force_sigsegv
(
sig
,
current
);
return
-
EFAULT
;
}
static
void
setup_rt_frame
(
int
sig
,
struct
k_sigaction
*
ka
,
siginfo_t
*
info
,
static
int
setup_rt_frame
(
int
sig
,
struct
k_sigaction
*
ka
,
siginfo_t
*
info
,
sigset_t
*
set
,
struct
pt_regs
*
regs
)
{
struct
rt_sigframe
*
frame
;
...
...
@@ -440,10 +441,11 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
regs
->
er2
=
(
unsigned
long
)
&
frame
->
uc
;
regs
->
er5
=
current
->
mm
->
start_data
;
/* GOT base */
return
;
return
0
;
give_sigsegv:
force_sigsegv
(
sig
,
current
);
return
-
EFAULT
;
}
/*
...
...
@@ -453,6 +455,7 @@ static void
handle_signal
(
unsigned
long
sig
,
siginfo_t
*
info
,
struct
k_sigaction
*
ka
,
sigset_t
*
oldset
,
struct
pt_regs
*
regs
)
{
int
ret
;
/* are we from a system call? */
if
(
regs
->
orig_er0
>=
0
)
{
switch
(
regs
->
er0
)
{
...
...
@@ -475,11 +478,12 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
/* set up the stack frame */
if
(
ka
->
sa
.
sa_flags
&
SA_SIGINFO
)
setup_rt_frame
(
sig
,
ka
,
info
,
oldset
,
regs
);
ret
=
setup_rt_frame
(
sig
,
ka
,
info
,
oldset
,
regs
);
else
setup_frame
(
sig
,
ka
,
oldset
,
regs
);
ret
=
setup_frame
(
sig
,
ka
,
oldset
,
regs
);
block_sigmask
(
ka
,
sig
);
if
(
!
ret
)
block_sigmask
(
ka
,
sig
);
}
/*
...
...
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