Commit e2d2afe1 authored by Josef Bacik's avatar Josef Bacik Committed by David S. Miller

bpf: fix states equal logic for varlen access

If we have a branch that looks something like this

int foo = map->value;
if (condition) {
  foo += blah;
} else {
  foo = bar;
}
map->array[foo] = baz;

We will incorrectly assume that the !condition branch is equal to the condition
branch as the register for foo will be UNKNOWN_VALUE in both cases.  We need to
adjust this logic to only do this if we didn't do a varlen access after we
processed the !condition branch, otherwise we have different ranges and need to
check the other branch as well.

Fixes: 48461135 ("bpf: allow access into map value arrays")
Reported-by: default avatarJann Horn <jannh@google.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fcba289
...@@ -2454,6 +2454,7 @@ static bool states_equal(struct bpf_verifier_env *env, ...@@ -2454,6 +2454,7 @@ static bool states_equal(struct bpf_verifier_env *env,
struct bpf_verifier_state *old, struct bpf_verifier_state *old,
struct bpf_verifier_state *cur) struct bpf_verifier_state *cur)
{ {
bool varlen_map_access = env->varlen_map_value_access;
struct bpf_reg_state *rold, *rcur; struct bpf_reg_state *rold, *rcur;
int i; int i;
...@@ -2467,12 +2468,17 @@ static bool states_equal(struct bpf_verifier_env *env, ...@@ -2467,12 +2468,17 @@ static bool states_equal(struct bpf_verifier_env *env,
/* If the ranges were not the same, but everything else was and /* If the ranges were not the same, but everything else was and
* we didn't do a variable access into a map then we are a-ok. * we didn't do a variable access into a map then we are a-ok.
*/ */
if (!env->varlen_map_value_access && if (!varlen_map_access &&
rold->type == rcur->type && rold->imm == rcur->imm) rold->type == rcur->type && rold->imm == rcur->imm)
continue; continue;
/* If we didn't map access then again we don't care about the
* mismatched range values and it's ok if our old type was
* UNKNOWN and we didn't go to a NOT_INIT'ed reg.
*/
if (rold->type == NOT_INIT || if (rold->type == NOT_INIT ||
(rold->type == UNKNOWN_VALUE && rcur->type != NOT_INIT)) (!varlen_map_access && rold->type == UNKNOWN_VALUE &&
rcur->type != NOT_INIT))
continue; continue;
if (rold->type == PTR_TO_PACKET && rcur->type == PTR_TO_PACKET && if (rold->type == PTR_TO_PACKET && rcur->type == PTR_TO_PACKET &&
......
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