[PATCH v2 net-next 2/5] bpf/verifier: when pruning a branch, ignore its write marks

[Edward Cree]

The fact that writes occurred in reaching the continuation state does
 not screen off its reads from us, because we're not really its parent.
So detect 'not really the parent' in do_propagate_liveness, and ignore
 write marks in that case.

Fixes: dc503a8ad984 ("bpf/verifier: track liveness for pruning")
Signed-off-by: Edward Cree <ec...@solarflare.com>
---
 kernel/bpf/verifier.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index e42c096..fdbaa60 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -3436,6 +3436,7 @@ static bool states_equal(struct bpf_verifier_env *env,
 static bool do_propagate_liveness(const struct bpf_verifier_state *state,
                                  struct bpf_verifier_state *parent)
 {
+       bool writes = parent == state->parent; /* Observe write marks */
        bool touched = false; /* any changes made? */
        int i;
 
@@ -3447,7 +3448,9 @@ static bool do_propagate_liveness(const struct 
bpf_verifier_state *state,
        for (i = 0; i < BPF_REG_FP; i++) {
                if (parent->regs[i].live & REG_LIVE_READ)
                        continue;
-               if (state->regs[i].live == REG_LIVE_READ) {
+               if (writes && (state->regs[i].live & REG_LIVE_WRITTEN))
+                       continue;
+               if (state->regs[i].live & REG_LIVE_READ) {
                        parent->regs[i].live |= REG_LIVE_READ;
                        touched = true;
                }
@@ -3460,7 +3463,9 @@ static bool do_propagate_liveness(const struct 
bpf_verifier_state *state,
                        continue;
                if (parent->spilled_regs[i].live & REG_LIVE_READ)
                        continue;
-               if (state->spilled_regs[i].live == REG_LIVE_READ) {
+               if (writes && (state->spilled_regs[i].live & REG_LIVE_WRITTEN))
+                       continue;
+               if (state->spilled_regs[i].live & REG_LIVE_READ) {
                        parent->spilled_regs[i].live |= REG_LIVE_READ;
                        touched = true;
                }