diff options
| author | Eric Andersen | 2001-07-05 16:09:32 +0000 |
|---|---|---|
| committer | Eric Andersen | 2001-07-05 16:09:32 +0000 |
| commit | 332394b577d75669cd30c3ea884e9152d63366f8 (patch) | |
| tree | 82258933d427e54a38477106b221e21bcdd1232e /init | |
| parent | d50a61956c032c9b80bee7dc58a931318d8f38da (diff) | |
| download | busybox-332394b577d75669cd30c3ea884e9152d63366f8.zip busybox-332394b577d75669cd30c3ea884e9152d63366f8.tar.gz | |
Be extra extra careful about what we dereference.
Diffstat (limited to 'init')
| -rw-r--r-- | init/halt.c | 5 | ||||
| -rw-r--r-- | init/poweroff.c | 5 | ||||
| -rw-r--r-- | init/reboot.c | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/init/halt.c b/init/halt.c index e875d04..10dcb42 100644 --- a/init/halt.c +++ b/init/halt.c @@ -28,7 +28,10 @@ extern int halt_main(int argc, char **argv) { #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ - return(kill(*(find_pid_by_name("init")), SIGUSR1)); + pid_t *pid = find_pid_by_name("init"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + return(kill(*pid, SIGUSR1)); #else return(kill(1, SIGUSR1)); #endif diff --git a/init/poweroff.c b/init/poweroff.c index 007099d..8bb20e9 100644 --- a/init/poweroff.c +++ b/init/poweroff.c @@ -28,7 +28,10 @@ extern int poweroff_main(int argc, char **argv) { #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ - return(kill(*(find_pid_by_name("init")), SIGUSR2)); + pid_t *pid = find_pid_by_name("init"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + return(kill(*pid, SIGUSR2)); #else return(kill(1, SIGUSR2)); #endif diff --git a/init/reboot.c b/init/reboot.c index 74d2cf6..35c147b 100644 --- a/init/reboot.c +++ b/init/reboot.c @@ -28,7 +28,10 @@ extern int reboot_main(int argc, char **argv) { #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ - return(kill(*(find_pid_by_name("init")), SIGTERM)); + pid_t *pid = find_pid_by_name("init"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + return(kill(*pid, SIGTERM)); #else return(kill(1, SIGTERM)); #endif |