Skip to contentSkip to conversation

bpf: fix sanitation rewrite in case of non-pointers

PATCH Applied Daniel Borkmann 5 participants 9 messages Mar 1, 2019 – Mar 6, 2019

Subsystems (4)
lore
Share & tools
lore

Daniel Borkmann

author maintainer
#0 lore raw

PATCH 1/1 bpf: fix sanitation rewrite in case of non-pointers

Marek reported that he saw an issue with the below snippet in that timing measurements where off when loaded as unpriv while results were reasonable when loaded as privileged:

    [...]
    uint64_t a = bpf_ktime_get_ns();
    uint64_t b = bpf_ktime_get_ns();
    uint64_t delta = b - a;
    if ((int64_t)delta > 0) {
    [...]

Turns out there is a bug where a corner case is missing in the fix d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths"), namely fixup_bpf_calls() only checks whether aux has a non-zero alu_state, but it also needs to test for the case of BPF_ALU_NON_POINTER since in both occasions we need to skip the masking rewrite (as there is nothing to mask).

Fixes d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")

---
[ Test case will be routed via bpf-next to avoid useless merge churn
due to test_verifier rework in bpf-next. ]

 kernel/bpf/verifier.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +2 -1
index 8f295b790297..5fcce2f4209d 100644
@@ -6920,7 +6920,8 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)
 			u32 off_reg;
 
 			aux = &env->insn_aux_data[i + delta];
-			if (!aux->alu_state)
+			if (!aux->alu_state ||
+			    aux->alu_state == BPF_ALU_NON_POINTER)
 				continue;
 
 			isneg = aux->alu_state & BPF_ALU_NEG_VALUE;
Signature · 1 line
2.17.1
#1 lore raw
Quoted 36 lines · Daniel Borkmann

Marek reported that he saw an issue with the below snippet in that timing measurements where off when loaded as unpriv while results were reasonable when loaded as privileged:

    [...]
    uint64_t a = bpf_ktime_get_ns();
    uint64_t b = bpf_ktime_get_ns();
    uint64_t delta = b - a;
    if ((int64_t)delta > 0) {
    [...]

Turns out there is a bug where a corner case is missing in the fix d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths"), namely fixup_bpf_calls() only checks whether aux has a non-zero alu_state, but it also needs to test for the case of BPF_ALU_NON_POINTER since in both occasions we need to skip the masking rewrite (as there is nothing to mask).

Fixes d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")

---
[ Test case will be routed via bpf-next to avoid useless merge churn
due to test_verifier rework in bpf-next. ]

 kernel/bpf/verifier.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +0 -0
index 8f295b790297..5fcce2f4209d 100644

kernel/bpf/verifier.c static int fixup_bpf_calls(struct bpf_verifier_env *env) · line 6924

Quoted 6 lines
kernel/bpf/verifier.c +2 -1
@@ -6920,7 +6920,8 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)
                        u32 off_reg;
 
                        aux = &env->insn_aux_data[i + delta];
-                       if (!aux->alu_state)
+                       if (!aux->alu_state ||
+                           aux->alu_state == BPF_ALU_NON_POINTER)

alu_state is a bitmap. Shall we check "aux->alu_state & BPF_ALU_NON_POINTER" here?

Thanks,
Song

Quoted 6 lines
kernel/bpf/verifier.c +0 -1
                                continue;
 
                        isneg = aux->alu_state & BPF_ALU_NEG_VALUE;
--

2.17.1

author maintainer
#2 lore raw
Quoted 39 lines · Song Liu
Quoted 38 lines · Daniel Borkmann

Marek reported that he saw an issue with the below snippet in that timing measurements where off when loaded as unpriv while results were reasonable when loaded as privileged:

    [...]
    uint64_t a = bpf_ktime_get_ns();
    uint64_t b = bpf_ktime_get_ns();
    uint64_t delta = b - a;
    if ((int64_t)delta > 0) {
    [...]

Turns out there is a bug where a corner case is missing in the fix d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths"), namely fixup_bpf_calls() only checks whether aux has a non-zero alu_state, but it also needs to test for the case of BPF_ALU_NON_POINTER since in both occasions we need to skip the masking rewrite (as there is nothing to mask).

Fixes d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")

---
[ Test case will be routed via bpf-next to avoid useless merge churn
due to test_verifier rework in bpf-next. ]

 kernel/bpf/verifier.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +0 -0
index 8f295b790297..5fcce2f4209d 100644
@@ -6920,7 +6920,8 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)
                        u32 off_reg;
 
Quoted 7 lines

kernel/bpf/verifier.c static int fixup_bpf_calls(struct bpf_verifier_env *env) · line 6924

Quoted 4 lines
kernel/bpf/verifier.c +2 -1
                        aux = &env->insn_aux_data[i + delta];
-                       if (!aux->alu_state)
+                       if (!aux->alu_state ||
+                           aux->alu_state == BPF_ALU_NON_POINTER)

alu_state is a bitmap. Shall we check "aux->alu_state & BPF_ALU_NON_POINTER" here?

The state in this case can only ever be BPF_ALU_NON_POINTER, any other setting from sanitize_val_alu() would be a violation.

Acked-by
#3 lore raw
Quoted 49 lines · Daniel Borkmann
Quoted 39 lines · Song Liu
Quoted 38 lines · Daniel Borkmann

Marek reported that he saw an issue with the below snippet in that timing measurements where off when loaded as unpriv while results were reasonable when loaded as privileged:

    [...]
    uint64_t a = bpf_ktime_get_ns();
    uint64_t b = bpf_ktime_get_ns();
    uint64_t delta = b - a;
    if ((int64_t)delta > 0) {
    [...]

Turns out there is a bug where a corner case is missing in the fix d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths"), namely fixup_bpf_calls() only checks whether aux has a non-zero alu_state, but it also needs to test for the case of BPF_ALU_NON_POINTER since in both occasions we need to skip the masking rewrite (as there is nothing to mask).

Fixes d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")

---
[ Test case will be routed via bpf-next to avoid useless merge churn
due to test_verifier rework in bpf-next. ]

 kernel/bpf/verifier.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +0 -0
index 8f295b790297..5fcce2f4209d 100644
@@ -6920,7 +6920,8 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)
                        u32 off_reg;
 
Quoted 7 lines

kernel/bpf/verifier.c static int fixup_bpf_calls(struct bpf_verifier_env *env) · line 6924

Quoted 4 lines
kernel/bpf/verifier.c +2 -1
                        aux = &env->insn_aux_data[i + delta];
-                       if (!aux->alu_state)
+                       if (!aux->alu_state ||
+                           aux->alu_state == BPF_ALU_NON_POINTER)

alu_state is a bitmap. Shall we check "aux->alu_state & BPF_ALU_NON_POINTER" here?

Quoted 2 lines

The state in this case can only ever be BPF_ALU_NON_POINTER, any other setting from sanitize_val_alu() would be a violation.

I see. Thanks for the explanation.

#4 lore raw
In reply to Daniel Borkmann
Quoted 18 lines · Daniel Borkmann

Marek reported that he saw an issue with the below snippet in that timing measurements where off when loaded as unpriv while results were reasonable when loaded as privileged:

    [...]
    uint64_t a = bpf_ktime_get_ns();
    uint64_t b = bpf_ktime_get_ns();
    uint64_t delta = b - a;
    if ((int64_t)delta > 0) {
    [...]

Turns out there is a bug where a corner case is missing in the fix d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths"), namely fixup_bpf_calls() only checks whether aux has a non-zero alu_state, but it also needs to test for the case of BPF_ALU_NON_POINTER since in both occasions we need to skip the masking rewrite (as there is nothing to mask).

Quoted 5 lines
Fixes d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")

Applied, Thanks

#5 lore raw
In reply to Daniel Borkmann

Hello!

Quoted 2 lines · Daniel Borkmann

Marek reported that he saw an issue with the below snippet in that timing measurements where off when loaded as unpriv while results

Were?

Quoted 16 lines

were reasonable when loaded as privileged:

     [...]
     uint64_t a = bpf_ktime_get_ns();
     uint64_t b = bpf_ktime_get_ns();
     uint64_t delta = b - a;
     if ((int64_t)delta > 0) {
     [...]

Turns out there is a bug where a corner case is missing in the fix d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths"), namely fixup_bpf_calls() only checks whether aux has a non-zero alu_state, but it also needs to test for the case of BPF_ALU_NON_POINTER since in both occasions we need to skip the masking rewrite (as there is nothing to mask).

Quoted 5 lines
Fixes d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")

[...]

MBR, Sergei

#6 lore raw
In reply to Daniel Borkmann
Quoted 18 lines · Daniel Borkmann

Marek reported that he saw an issue with the below snippet in that timing measurements where off when loaded as unpriv while results were reasonable when loaded as privileged:

    [...]
    uint64_t a = bpf_ktime_get_ns();
    uint64_t b = bpf_ktime_get_ns();
    uint64_t delta = b - a;
    if ((int64_t)delta > 0) {
    [...]

Turns out there is a bug where a corner case is missing in the fix d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths"), namely fixup_bpf_calls() only checks whether aux has a non-zero alu_state, but it also needs to test for the case of BPF_ALU_NON_POINTER since in both occasions we need to skip the masking rewrite (as there is nothing to mask).

Quoted 6 lines
Fixes d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")

---

Could you please queue it for -stable which has d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")?

Thanks,
Jakub