]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'bpf-fix-oob-read-and-add-tests-for-load-acquire-store-release'
authorAlexei Starovoitov <ast@kernel.org>
Sat, 22 Mar 2025 13:15:27 +0000 (06:15 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 22 Mar 2025 13:19:09 +0000 (06:19 -0700)
commit9aa8fe29f624610b4694d5b5695e1017c4753f31
tree993a4903cf9b49124c6cea0c33739ce65d8f1072
parent307ef667e94530c2f2f77797bfe9ea85c22bec7d
parent5f3077d7fcd4d777b52473a7d8d6fd065a7deb20
Merge branch 'bpf-fix-oob-read-and-add-tests-for-load-acquire-store-release'

Kohei Enju says:

====================
bpf: Fix OOB read and add tests for load-acquire/store-release

This patch series addresses an out-of-bounds read issue in
check_atomic_load/store() reported by syzkaller when an invalid register
number (MAX_BPF_REG or greater) is used.

The first patch fixes the actual bug by changing the order of validity
checks, ensuring register validity is checked before atomic_ptr_type_ok()
is called.
It also updates some tests that were assuming the previous order of checks.

The second patch adds new tests specifically for the invalid register
number case to prevent regression in the future.

Changes:
  v3:
    - Change invalid register from R11 to R15 in new tests
  v2: https://lore.kernel.org/all/20250321110010.95217-4-enjuk@amazon.com/
    - Just swap atomic_ptr_type_ok() and check_load_mem()/check_store_reg()
    - Update some tests that were assuming the previous order of checks
    - Add new tests specifically for the invalid register number
  v1: https://lore.kernel.org/bpf/20250314195619.23772-2-enjuk@amazon.com/

Reported-by: syzbot+a5964227adc0f904549c@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=a5964227adc0f904549c
====================

Link: https://patch.msgid.link/20250322045340.18010-4-enjuk@amazon.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>