bpf: enhance validation of pointer formatting #8098
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![kernel-patches-daemon-bpf[bot]](https://avatars.githubusercontent.com/u/70728002?s=60&v=4){kind=small}
|
Upstream branch: adc2186 |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
8bcc9ce to
081a635
Compare
|
Upstream branch: adc2186 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
1a3feaa to
5fa6101
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
081a635 to
8698c7f
Compare
|
Upstream branch: adc2186 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
5fa6101 to
22ec9ad
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
8698c7f to
d3d87c9
Compare
|
Upstream branch: fc39fb5 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
22ec9ad to
5c545fc
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
d3d87c9 to
efd6803
Compare
|
Upstream branch: fc39fb5 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
5c545fc to
29c1cdc
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
efd6803 to
35b1c4f
Compare
|
Upstream branch: fc39fb5 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
29c1cdc to
764d8b6
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
35b1c4f to
31da2a0
Compare
|
Upstream branch: 28eb75e |
|
Upstream branch: 3448ad2 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
57a6714 to
ce93c0b
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
8a189e3 to
1f69c0c
Compare
|
Upstream branch: 537a252 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
ce93c0b to
e5609b8
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
1f69c0c to
2ca5f12
Compare
|
Upstream branch: 537a252 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
e5609b8 to
f24a50b
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
2ca5f12 to
c363912
Compare
|
Upstream branch: 537a252 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
f24a50b to
da00e1d
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
c363912 to
bedc110
Compare
|
Upstream branch: d4c4435 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
da00e1d to
4fdac56
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
bedc110 to
4500c12
Compare
|
Upstream branch: bd74e23 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
4fdac56 to
a643f75
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
4500c12 to
ea05926
Compare
added 2 commits
December 2, 2024 19:09
Fuzzing reports a warning in format_decode() Please remove unsupported %� in format string WARNING: CPU: 0 PID: 5091 at lib/vsprintf.c:2680 format_decode+0x1193/0x1bb0 lib/vsprintf.c:2680 Modules linked in: CPU: 0 PID: 5091 Comm: syz-executor879 Not tainted 6.10.0-rc1-syzkaller-00021-ge0cce98fe279 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024 RIP: 0010:format_decode+0x1193/0x1bb0 lib/vsprintf.c:2680 Call Trace: <TASK> bstr_printf+0x137/0x1210 lib/vsprintf.c:3253 ____bpf_trace_printk kernel/trace/bpf_trace.c:390 [inline] bpf_trace_printk+0x1a1/0x230 kernel/trace/bpf_trace.c:375 bpf_prog_21da1b68f62e1237+0x36/0x41 bpf_dispatcher_nop_func include/linux/bpf.h:1243 [inline] __bpf_prog_run include/linux/filter.h:691 [inline] bpf_prog_run include/linux/filter.h:698 [inline] bpf_test_run+0x40b/0x910 net/bpf/test_run.c:425 bpf_prog_test_run_skb+0xafa/0x13a0 net/bpf/test_run.c:1066 bpf_prog_test_run+0x33c/0x3b0 kernel/bpf/syscall.c:4291 __sys_bpf+0x48d/0x810 kernel/bpf/syscall.c:5705 __do_sys_bpf kernel/bpf/syscall.c:5794 [inline] __se_sys_bpf kernel/bpf/syscall.c:5792 [inline] __x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:5792 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f The problem occurs when trying to pass %p% at the end of format string, which would result in skipping last % and passing invalid format string down to format_decode() that would cause warning because of invalid character after %. Fix issue by advancing pointer only if next char is format modifier. If next char is null/space/punct, then just accept formatting as is, without advancing the pointer. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=e2c932aec5c8a6e1d31c Fixes: 48cac3f ("bpf: Implement formatted output helpers with bstr_printf") Co-developed-by: Nikita Marushkin <[email protected]> Signed-off-by: Nikita Marushkin <[email protected]> Signed-off-by: Ilya Shchipletsov <[email protected]> Acked-by: Yonghong Song <[email protected]> Acked-by: Florent Revest <[email protected]>
Extend snprintf negative tests to cover pointer specifiers to prevent possible invalid handling of %p% from happening again. ./test_progs -t snprintf #302/1 snprintf/snprintf_positive:OK #302/2 snprintf/snprintf_negative:OK #302 snprintf:OK #303 snprintf_btf:OK Summary: 2/2 PASSED, 0 SKIPPED, 0 FAILED Co-developed-by: Nikita Marushkin <[email protected]> Signed-off-by: Nikita Marushkin <[email protected]> Signed-off-by: Ilya Shchipletsov <[email protected]> Acked-by: Yonghong Song <[email protected]> Acked-by: Florent Revest <[email protected]>
|
Upstream branch: bd74e23 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/903963=>bpf
branch
from
a643f75 to
824b75a
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=903963 expired. Closing PR. |
kernel-patches-daemon-bpf
bot
added
changes-requested
V2
and removed
new
V3
V3-ci-pass
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: bpf: enhance validation of pointer formatting
version: 3
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=910895