From: Pavel Machek <pavel@denx.de>
To: stable@vger.kernel.org,
kernel list <linux-kernel@vger.kernel.org>,
daniel@iogearbox.net, john.fastabend@gmail.com, ast@kernel.org
Subject: CVE-2021-3600 aka bpf: Fix 32 bit src register truncation on div/mod
Date: Thu, 26 Aug 2021 12:23:37 +0200 [thread overview]
Message-ID: <20210826102337.GA7362@duo.ucw.cz> (raw)
[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]
Hi!
As far as I can tell, CVE-2021-3600 is still a problem for 4.14 and
4.19.
Unfortunately, those kernels lack BPF_JMP32 support, and that support
is too big and intrusive to backport.
So I tried to come up with solution without JMP32 support... only to
end up with not seeing the bug in the affected code.
Changelog says:
bpf: Fix 32 bit src register truncation on div/mod
While reviewing a different fix, John and I noticed an oddity in one of the
BPF program dumps that stood out, for example:
# bpftool p d x i 13
0: (b7) r0 = 808464450
1: (b4) w4 = 808464432
2: (bc) w0 = w0
3: (15) if r0 == 0x0 goto pc+1
4: (9c) w4 %= w0
[...]
In line 2 we noticed that the mov32 would 32 bit truncate the original src
register for the div/mod operation. While for the two operations the dst
register is typically marked unknown e.g. from adjust_scalar_min_max_vals()
the src register is not, and thus verifier keeps tracking original bounds,
simplified:
So this explains "mov32 w0, w0" is problematic, and fixes the bug by
replacing it with jmp32. Unfortunately, I can't do that in 4.19; plus
I don't really see how the bug is solved -- we avoided adding mov32
sequence that triggers the problem, but the problematic sequence could
still be produced by the userspace, no?
Does adjust_scalar_min_max_vals still need fixing?
Do you have any hints how to solve this in 4.19?
Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
next reply other threads:[~2021-08-26 10:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 10:23 Pavel Machek [this message]
2021-08-26 11:06 ` CVE-2021-3600 aka bpf: Fix 32 bit src register truncation on div/mod Thadeu Lima de Souza Cascardo
2021-08-30 18:38 ` Thadeu Lima de Souza Cascardo
2021-08-31 13:30 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210826102337.GA7362@duo.ucw.cz \
--to=pavel@denx.de \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).