2 files changed, 9 insertions, 6 deletions

diff --git a/procps/kill.c b/procps/kill.c
index 8aa0eb3e2..0b170fa3d 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -167,13 +167,15 @@ int kill_main(int argc, char **argv)
                 /* Stop all processes */
                 kill(-1, SIGSTOP);
                 /* Signal all processes except those in our session */
-                while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) {
+                while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID)) != NULL) {
                         int i;
 
                         if (p->sid == (unsigned)sid
                          || p->pid == (unsigned)pid
-                         || p->pid == 1)
+                         || p->pid == 1
+                        ) {
                                 continue;
+                        }
 
                         /* All remaining args must be -o PID options.
                          * Check p->pid against them. */
@@ -257,9 +259,10 @@ int kill_main(int argc, char **argv)
                         pid = bb_strtoi(arg, &end, 10);
                         if (errno && (errno != EINVAL || *end != ' ')) {
                                 bb_error_msg("invalid number '%s'", arg);
-                                *end = '\0';
                                 errors++;
-                        } else if (kill(pid, signo) != 0) {
+                                break;
+                        }
+                        if (kill(pid, signo) != 0) {
                                 bb_perror_msg("can't kill pid %d", (int)pid);
                                 errors++;
                         }
diff --git a/procps/sysctl.c b/procps/sysctl.c
index cb3b6a25a..5296d0f58 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -224,7 +224,7 @@ static int sysctl_handle_preload_file(const char *filename)
         parser = config_open(filename);
         /* Must do it _after_ config_open(): */
         xchdir("/proc/sys");
-        /* xchroot(".") - if you are paranoid */
+        /* xchroot("/proc/sys") - if you are paranoid */
 
 //TODO: ';' is comment char too
 //TODO: comment may be only at line start. "var=1 #abc" - "1 #abc" is the value
@@ -260,7 +260,7 @@ int sysctl_main(int argc UNUSED_PARAM, char **argv)
                 return sysctl_handle_preload_file(*argv ? *argv : "/etc/sysctl.conf");
         }
         xchdir("/proc/sys");
-        /* xchroot(".") - if you are paranoid */
+        /* xchroot("/proc/sys") - if you are paranoid */
         if (opt & (FLAG_TABLE_FORMAT | FLAG_SHOW_ALL)) {
                 return sysctl_act_recursive(".");
         }