Commit bc895e8b authored by Daniel Borkmann's avatar Daniel Borkmann

bpf: Fix signed_{sub,add32}_overflows type handling

Fix incorrect signed_{sub,add32}_overflows() input types (and a related buggy
comment). It looks like this might have slipped in via copy/paste issue, also
given prior to 3f50f132 ("bpf: Verifier, do explicit ALU32 bounds tracking")
the signature of signed_sub_overflows() had s64 a and s64 b as its input args
whereas now they are truncated to s32. Thus restore proper types. Also, the case
of signed_add32_overflows() is not consistent to signed_sub32_overflows(). Both
have s32 as inputs, therefore align the former.

Fixes: 3f50f132 ("bpf: Verifier, do explicit ALU32 bounds tracking")
Reported-by: default avatarDe4dCr0w <sa516203@mail.ustc.edu.cn>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent b425e24a
...@@ -5313,7 +5313,7 @@ static bool signed_add_overflows(s64 a, s64 b) ...@@ -5313,7 +5313,7 @@ static bool signed_add_overflows(s64 a, s64 b)
return res < a; return res < a;
} }
static bool signed_add32_overflows(s64 a, s64 b) static bool signed_add32_overflows(s32 a, s32 b)
{ {
/* Do the add in u32, where overflow is well-defined */ /* Do the add in u32, where overflow is well-defined */
s32 res = (s32)((u32)a + (u32)b); s32 res = (s32)((u32)a + (u32)b);
...@@ -5323,7 +5323,7 @@ static bool signed_add32_overflows(s64 a, s64 b) ...@@ -5323,7 +5323,7 @@ static bool signed_add32_overflows(s64 a, s64 b)
return res < a; return res < a;
} }
static bool signed_sub_overflows(s32 a, s32 b) static bool signed_sub_overflows(s64 a, s64 b)
{ {
/* Do the sub in u64, where overflow is well-defined */ /* Do the sub in u64, where overflow is well-defined */
s64 res = (s64)((u64)a - (u64)b); s64 res = (s64)((u64)a - (u64)b);
...@@ -5335,7 +5335,7 @@ static bool signed_sub_overflows(s32 a, s32 b) ...@@ -5335,7 +5335,7 @@ static bool signed_sub_overflows(s32 a, s32 b)
static bool signed_sub32_overflows(s32 a, s32 b) static bool signed_sub32_overflows(s32 a, s32 b)
{ {
/* Do the sub in u64, where overflow is well-defined */ /* Do the sub in u32, where overflow is well-defined */
s32 res = (s32)((u32)a - (u32)b); s32 res = (s32)((u32)a - (u32)b);
if (b < 0) if (b < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment