2 files changed, 6 insertions, 6 deletions

diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c
index 427b9487b..66e434833 100644
--- a/util-linux/fdisk_sun.c
+++ b/util-linux/fdisk_sun.c
@@ -292,10 +292,10 @@ create_sunlabel(void)
                 } else {
                         g_heads = read_int(1, g_heads, 1024, 0, "Heads");
                         g_sectors = read_int(1, g_sectors, 1024, 0, "Sectors/track");
-                if (g_cylinders)
-                        g_cylinders = read_int(1, g_cylinders - 2, 65535, 0, "Cylinders");
-                else
-                        g_cylinders = read_int(1, 0, 65535, 0, "Cylinders");
+                        if (g_cylinders)
+                                g_cylinders = read_int(1, g_cylinders - 2, 65535, 0, "Cylinders");
+                        else
+                                g_cylinders = read_int(1, 0, 65535, 0, "Cylinders");
                         sunlabel->nacyl = SUN_SSWAP16(read_int(0, 2, 65535, 0, "Alternate cylinders"));
                         sunlabel->pcylcount = SUN_SSWAP16(read_int(0, g_cylinders + SUN_SSWAP16(sunlabel->nacyl), 65535, 0, "Physical cylinders"));
                         sunlabel->rspeed = SUN_SSWAP16(read_int(1, 5400, 100000, 0, "Rotation speed (rpm)"));
diff --git a/util-linux/taskset.c b/util-linux/taskset.c
index afe2f04d2..d2ef9b98f 100644
--- a/util-linux/taskset.c
+++ b/util-linux/taskset.c
@@ -218,7 +218,7 @@ static int process_pid_str(const char *pid_str, unsigned opts, char *aff)
         ul *mask;
         unsigned mask_size_in_bytes;
         const char *current_new;
-        pid_t pid = xatoi_positive(pid_str);
+        pid_t pid = !pid_str ? 0 : xatou_range(pid_str, 1, INT_MAX); /* disallow "0": "taskset -p 0" should fail */
 
         mask_size_in_bytes = SZOF_UL;
         current_new = "current";
@@ -343,7 +343,7 @@ int taskset_main(int argc UNUSED_PARAM, char **argv)
                 /* <aff> <cmd...> */
                 if (!*argv)
                         bb_show_usage();
-                process_pid_str("0", opts, aff);
+                process_pid_str(NULL, opts, aff);
                 BB_EXECVP_or_die(argv);
         }