Commit b9d023fb authored by Roland McGrath's avatar Roland McGrath Committed by Greg Kroah-Hartman

execve: make responsive to SIGKILL with large arguments

commit 9aea5a65 upstream.

An execve with a very large total of argument/environment strings
can take a really long time in the execve system call.  It runs
uninterruptibly to count and copy all the strings.  This change
makes it abort the exec quickly if sent a SIGKILL.

Note that this is the conservative change, to interrupt only for
SIGKILL, by using fatal_signal_pending().  It would be perfectly
correct semantics to let any signal interrupt the string-copying in
execve, i.e. use signal_pending() instead of fatal_signal_pending().
We'll save that change for later, since it could have user-visible
consequences, such as having a timer set too quickly make it so that
an execve can never complete, though it always happened to work before.
Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bd720c92
...@@ -376,6 +376,9 @@ static int count(char __user * __user * argv, int max) ...@@ -376,6 +376,9 @@ static int count(char __user * __user * argv, int max)
argv++; argv++;
if (i++ >= max) if (i++ >= max)
return -E2BIG; return -E2BIG;
if (fatal_signal_pending(current))
return -ERESTARTNOHAND;
cond_resched(); cond_resched();
} }
} }
...@@ -419,6 +422,10 @@ static int copy_strings(int argc, char __user * __user * argv, ...@@ -419,6 +422,10 @@ static int copy_strings(int argc, char __user * __user * argv,
while (len > 0) { while (len > 0) {
int offset, bytes_to_copy; int offset, bytes_to_copy;
if (fatal_signal_pending(current)) {
ret = -ERESTARTNOHAND;
goto out;
}
cond_resched(); cond_resched();
offset = pos % PAGE_SIZE; offset = pos % PAGE_SIZE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment