1 files changed, 3 insertions, 1 deletions

diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index 4815b6a76..708abd9f2 100644
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -93,8 +93,10 @@ int taskset_main(int argc ATTRIBUTE_UNUSED, char **argv)
                 unsigned i;
                 /* Do not allow zero mask: */
                 unsigned long long m = xstrtoull_range(aff, 0, 1, ULLONG_MAX);
+                enum { CNT_BIT = CPU_SETSIZE < sizeof(m)*8 ? CPU_SETSIZE : sizeof(m)*8 };
+
                 CPU_ZERO(&mask);
-                for (i = 0; i < CPU_SETSIZE; i++) {
+                for (i = 0; i < CNT_BIT; i++) {
                         unsigned long long bit = (1ULL << i);
                         if (bit & m)
                                 CPU_SET(i, &mask);