Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
R128
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ermine
R128
Commits
8f13621a
Commit
8f13621a
authored
7 years ago
by
Al Viro
Browse files
Options
Downloads
Patches
Plain Diff
sigpending(): move compat to native
... and kill set_fs() use Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
d9e968cb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
kernel/compat.c
+0
-23
0 additions, 23 deletions
kernel/compat.c
kernel/signal.c
+12
-0
12 additions, 0 deletions
kernel/signal.c
with
12 additions
and
23 deletions
kernel/compat.c
+
0
−
23
View file @
8f13621a
...
...
@@ -350,29 +350,6 @@ COMPAT_SYSCALL_DEFINE3(setitimer, int, which,
return
0
;
}
#ifdef __ARCH_WANT_SYS_SIGPENDING
/*
* Assumption: old_sigset_t and compat_old_sigset_t are both
* types that can be passed to put_user()/get_user().
*/
COMPAT_SYSCALL_DEFINE1
(
sigpending
,
compat_old_sigset_t
__user
*
,
set
)
{
old_sigset_t
s
;
long
ret
;
mm_segment_t
old_fs
=
get_fs
();
set_fs
(
KERNEL_DS
);
ret
=
sys_sigpending
((
old_sigset_t
__user
*
)
&
s
);
set_fs
(
old_fs
);
if
(
ret
==
0
)
ret
=
put_user
(
s
,
set
);
return
ret
;
}
#endif
#ifdef __ARCH_WANT_SYS_SIGPROCMASK
/*
...
...
This diff is collapsed.
Click to expand it.
kernel/signal.c
+
12
−
0
View file @
8f13621a
...
...
@@ -3254,6 +3254,18 @@ SYSCALL_DEFINE1(sigpending, old_sigset_t __user *, set)
return
sys_rt_sigpending
((
sigset_t
__user
*
)
set
,
sizeof
(
old_sigset_t
));
}
#ifdef CONFIG_COMPAT
COMPAT_SYSCALL_DEFINE1
(
sigpending
,
compat_old_sigset_t
__user
*
,
set32
)
{
sigset_t
set
;
int
err
=
do_sigpending
(
&
set
,
sizeof
(
old_sigset_t
));
if
(
err
==
0
)
if
(
copy_to_user
(
set32
,
&
set
,
sizeof
(
old_sigset_t
)))
err
=
-
EFAULT
;
return
err
;
}
#endif
#endif
#ifdef __ARCH_WANT_SYS_SIGPROCMASK
...
...
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