Skip to contentSkip to conversation

use correct format string specifier for unsigned 32 bounds

PATCH In review Benedict Schlueter 2 participants 2 messages Jun 4, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 use correct format string specifier for unsigned 32 bounds

From fd076dc5f2bd5ec4e9cb49530e77cf2d3e4f42c2 Mon Sep 17 00:00:00 2001
From: Benedict Schlueter <[email protected]>
Date: Wed, 2 Jun 2021 21:42:39 +0200
Subject: [PATCH bpf-next]
 use correct format string specifier for unsigned 32 bounds

when printing an unsigned value, it should be a positive number

verifier log before the patch ([...],s32_max_value=-2,u32_min_value=-16,u32_max_value=-2)

verifier log after the patch ([...],s32_max_value=-2,u32_min_value=4294967280,u32_max_value=4294967294)

Fixes 3f50f132d840 ("bpf: Verifier, do explicit ALU32 bounds tracking")

---
 kernel/bpf/verifier.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/bpf/verifier.c +0 -0
index 1de4b8c6ee42..ea482ebaeb26 100644
@@ -690,12 +690,12 @@ static void print_verifier_state(struct bpf_verifier_env *env,

                         (int)(reg->s32_max_value)); if (reg->u32_min_value != reg->umin_value && reg->u32_min_value != U32_MIN) -                    verbose(env, ",u32_min_value=%d", -                        (int)(reg->u32_min_value)); +                    verbose(env, ",u32_min_value=%u", +                        (unsigned int)(reg->u32_min_value)); if (reg->u32_max_value != reg->umax_value && reg->u32_max_value != U32_MAX) -                    verbose(env, ",u32_max_value=%d", -                        (int)(reg->u32_max_value)); +                    verbose(env, ",u32_max_value=%u", +                        (unsigned int)(reg->u32_max_value)); }
             verbose(env, ")");
         }

Signature · 1 line
2.31.1
#1 lore raw
Quoted 5 lines · Benedict Schlueter

From fd076dc5f2bd5ec4e9cb49530e77cf2d3e4f42c2 Mon Sep 17 00:00:00 2001
From: Benedict Schlueter <[email protected]>
Date: Wed, 2 Jun 2021 21:42:39 +0200
Subject: [PATCH bpf-next]
 use correct format string specifier for unsigned 32 bounds

The above email header is not needed.

Quoted 2 lines

when printing an unsigned value, it should be a positive number

when -> "When"

to be precise, "a non-negative number".

Quoted 19 lines

verifier log before the patch ([...],s32_max_value=-2,u32_min_value=-16,u32_max_value=-2)

verifier log after the patch ([...],s32_max_value=-2,u32_min_value=4294967280,u32_max_value=4294967294)

Fixes 3f50f132d840 ("bpf: Verifier, do explicit ALU32 bounds tracking")
---
  kernel/bpf/verifier.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
kernel/bpf/verifier.c +0 -0
index 1de4b8c6ee42..ea482ebaeb26 100644

kernel/bpf/verifier.c static void print_verifier_state(struct · line 695

Quoted 8 lines
kernel/bpf/verifier.c +2 -2
@@ -690,12 +690,12 @@ static void print_verifier_state(struct 
 bpf_verifier_env *env,
                          (int)(reg->s32_max_value));
                  if (reg->u32_min_value != reg->umin_value &&
                      reg->u32_min_value != U32_MIN)
-                    verbose(env, ",u32_min_value=%d",
-                        (int)(reg->u32_min_value));
+                    verbose(env, ",u32_min_value=%u",
+                        (unsigned int)(reg->u32_min_value));

There is no need to cast to "unsigned int", reg->u32_min_value is u32 type.

kernel/bpf/verifier.c static void print_verifier_state(struct · line 699

Quoted 6 lines
kernel/bpf/verifier.c +2 -2
                  if (reg->u32_max_value != reg->umax_value &&
                      reg->u32_max_value != U32_MAX)
-                    verbose(env, ",u32_max_value=%d",
-                        (int)(reg->u32_max_value));
+                    verbose(env, ",u32_max_value=%u",
+                        (unsigned int)(reg->u32_max_value));

The same as above, no need to cast for reg->u32_max_value.

Quoted 3 lines
kernel/bpf/verifier.c +0 -0
              }
              verbose(env, ")");

         }