bpf: enhance validation of pointer formatting #4684
+24
−4
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-rc[bot]](https://avatars.githubusercontent.com/u/70728002?s=60&v=4){kind=small}
|
Upstream branch: adc2186 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
3be981a
to
243c5cf
Compare
|
Upstream branch: adc2186 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
604ff7a
to
1cc4275
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
243c5cf
to
1ebf15c
Compare
|
Upstream branch: adc2186 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
1cc4275
to
8087485
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
1ebf15c
to
bc701b7
Compare
|
Upstream branch: fc39fb5 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
8087485
to
3734ee1
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
bc701b7
to
932fa97
Compare
|
Upstream branch: fc39fb5 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
3734ee1
to
fcbf23e
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
932fa97
to
133abb9
Compare
|
Upstream branch: fc39fb5 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
fcbf23e
to
4ecc2cb
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
133abb9
to
758e2c3
Compare
|
Upstream branch: 28eb75e |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
4ecc2cb
to
b6b2ed5
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
758e2c3
to
64bcbe2
Compare
|
Upstream branch: 9f16d5e |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
b6b2ed5
to
7b9eeff
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
64bcbe2
to
efd0e24
Compare
|
Upstream branch: 8618f5f |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
7b9eeff
to
871a198
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
efd0e24
to
7a3e834
Compare
|
Upstream branch: 20a39ea |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
871a198
to
d31261b
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
7a3e834
to
a704d36
Compare
|
Upstream branch: ef3ba8c |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
d31261b
to
2a7a6c4
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
a704d36
to
b19cdf2
Compare
|
Upstream branch: 6b64128 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
2a7a6c4
to
d8ef0ac
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
b19cdf2
to
ac77fa8
Compare
|
Upstream branch: 6b64128 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
d8ef0ac
to
9d11c23
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
ac77fa8
to
75271bb
Compare
|
Upstream branch: 3448ad2 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
9d11c23
to
b9653c6
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
75271bb
to
6735c58
Compare
|
Upstream branch: 3448ad2 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
b9653c6
to
1c038b2
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
6735c58
to
e9d46d9
Compare
|
Upstream branch: 3448ad2 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
1c038b2
to
fb56a23
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
e9d46d9
to
8170504
Compare
|
Upstream branch: 3448ad2 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
fb56a23
to
cbaa0c6
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
8170504
to
bf5cb90
Compare
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: syzbot+e2c932aec5c8a6e1d31c@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=e2c932aec5c8a6e1d31c Fixes: 48cac3f ("bpf: Implement formatted output helpers with bstr_printf") Co-developed-by: Nikita Marushkin <hfggklm@gmail.com> Signed-off-by: Nikita Marushkin <hfggklm@gmail.com> Signed-off-by: Ilya Shchipletsov <rabbelkin@mail.ru> Acked-by: Yonghong Song <yonghong.song@linux.dev> Acked-by: Florent Revest <revest@chromium.org>
|
Upstream branch: 537a252 |
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 <hfggklm@gmail.com> Signed-off-by: Nikita Marushkin <hfggklm@gmail.com> Signed-off-by: Ilya Shchipletsov <rabbelkin@mail.ru> Acked-by: Yonghong Song <yonghong.song@linux.dev> Acked-by: Florent Revest <revest@chromium.org>
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/903963=>bpf
branch
from
cbaa0c6
to
038336b
Compare
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