Backport of upstream commits [1] and [2] to 4.19-stable broke test_verifier and test_align bpf selftests. [1] 2fa7d94afc1a ("bpf: Fix the off-by-two error in range markings") [2] 294f2fc6da27 ("bpf: Verifer, adjust_scalar_min_max_vals to always call update_reg_bounds()") This series fixes all failing test_verifier/test_align testcases for 4.19: root@intel-x86-64:~/bpf# ./test_verifier ... #664/p mov64 src == dst OK #665/p mov64 src != dst OK #666/u calls: ctx read at start of subprog OK #666/p calls: ctx read at start of subprog OK Summary: 932 PASSED, 0 SKIPPED, 0 FAILED root@intel-x86-64:~/bpf# ./test_align Test 0: mov ... PASS Test 1: shift ... PASS Test 2: addsub ... PASS Test 3: mul ... PASS Test 4: unknown shift ... PASS Test 5: unknown mul ... PASS Test 6: packet const offset ... PASS Test 7: packet variable offset ... PASS Test 8: packet variable offset 2 ... PASS Test 9: dubious pointer arithmetic ... PASS Test 10: variable subtraction ... PASS Test 11: pointer variable subtraction ... PASS Results: 12 pass 0 fail Maxim Mikityanskiy (1): bpf: Fix the off-by-two error in range markings Stanislav Fomichev (1): selftests/bpf: Fix test_align verifier log patterns tools/testing/selftests/bpf/test_align.c | 27 ++++++++--------- tools/testing/selftests/bpf/test_verifier.c | 32 ++++++++++----------- 2 files changed, 30 insertions(+), 29 deletions(-) -- 2.37.2