Skip to content

tun: add missing verification for short frame - #172

Merged
jallisonciq merged 1 commit into
ciqlts8_6from
{jallison}_ciqlts8_6_CVE-2024-41091
Mar 26, 2025
Merged

tun: add missing verification for short frame#172
jallisonciq merged 1 commit into
ciqlts8_6from
{jallison}_ciqlts8_6_CVE-2024-41091

Conversation

@jallisonciq

Copy link
Copy Markdown

jira VULN-8272
cve CVE-2024-41091
commit-author Dongli Zhang dongli.zhang@oracle.com commit 0495848

The cited commit missed to check against the validity of the frame length in the tun_xdp_one() path, which could cause a corrupted skb to be sent downstack. Even before the skb is transmitted, the tun_xdp_one-->eth_type_trans() may access the Ethernet header although it can be less than ETH_HLEN. Once transmitted, this could either cause out-of-bound access beyond the actual length, or confuse the underlayer with incorrect or inconsistent header length in the skb metadata.

In the alternative path, tun_get_user() already prohibits short frame which has the length less than Ethernet header size from being transmitted for IFF_TAP.

This is to drop any frame shorter than the Ethernet header size just like how tun_get_user() does.

CVE: CVE-2024-41091
Inspired-by: https://lore.kernel.org/netdev/1717026141-25716-1-git-send-email-si-wei.liu@oracle.com/ Fixes: 043d222 ("tuntap: accept an array of XDP buffs through sendmsg()")
Cc: stable@vger.kernel.org
Signed-off-by: Dongli Zhang dongli.zhang@oracle.com
Reviewed-by: Si-Wei Liu si-wei.liu@oracle.com
Reviewed-by: Willem de Bruijn willemb@google.com
Reviewed-by: Paolo Abeni pabeni@redhat.com
Reviewed-by: Jason Wang jasowang@redhat.com
Link: https://patch.msgid.link/20240724170452.16837-3-dongli.zhang@oracle.com
Signed-off-by: Jakub Kicinski kuba@kernel.org
(cherry picked from commit 0495848)
Signed-off-by: Jeremy Allison jallison@ciq.com

$ uname -a
Linux r8_6_lts 4.18.0-ciqlts8_6+ #1 SMP Thu Mar 20 18:36:43 UTC 2025 x86_64 x86_64 x86_64 GNU/Linux
[
baseline_selftest.txt
patched_selftest.txt
](url)

jira VULN-8272
cve CVE-2024-41091
commit-author Dongli Zhang <dongli.zhang@oracle.com>
commit 0495848
The cited commit missed to check against the validity of the frame length
in the tun_xdp_one() path, which could cause a corrupted skb to be sent
downstack. Even before the skb is transmitted, the
tun_xdp_one-->eth_type_trans() may access the Ethernet header although it
can be less than ETH_HLEN. Once transmitted, this could either cause
out-of-bound access beyond the actual length, or confuse the underlayer
with incorrect or inconsistent header length in the skb metadata.
In the alternative path, tun_get_user() already prohibits short frame which
has the length less than Ethernet header size from being transmitted for
IFF_TAP.
This is to drop any frame shorter than the Ethernet header size just like
how tun_get_user() does.
CVE: CVE-2024-41091
Inspired-by: https://lore.kernel.org/netdev/1717026141-25716-1-git-send-email-si-wei.liu@oracle.com/
Fixes: 043d222 ("tuntap: accept an array of XDP buffs through sendmsg()")
Cc: stable@vger.kernel.org
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: Si-Wei Liu <si-wei.liu@oracle.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Link: https://patch.msgid.link/20240724170452.16837-3-dongli.zhang@oracle.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 0495848)
Signed-off-by: Jeremy Allison <jallison@ciq.com>

@bmastbergenbmastbergen left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥌

@PlaidCatPlaidCat left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@jallisonciq
jallisonciq merged commit c4e2f23 into ciqlts8_6Mar 26, 2025
@jallisonciq
jallisonciq deleted the {jallison}_ciqlts8_6_CVE-2024-41091 branch March 26, 2025 20:45
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jallisonciq@PlaidCat@bmastbergen