tap: add missing verification for short frame #109
Conversation
jira VULN-9072 cve CVE-2024-41090 commit-author Si-Wei Liu <si-wei.liu@oracle.com> commit ed7f2af The cited commit missed to check against the validity of the frame length in the tap_get_user_xdp() path, which could cause a corrupted skb to be sent downstack. Even before the skb is transmitted, the tap_get_user_xdp()-->skb_set_network_header() may assume the size is more 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, tap_get_user() already prohibits short frame which has the length less than Ethernet header size from being transmitted. This is to drop any frame shorter than the Ethernet header size just like how tap_get_user() does. CVE: CVE-2024-41090 Link: https://lore.kernel.org/netdev/1717026141-25716-1-git-send-email-si-wei.liu@oracle.com/ Fixes: 0efac27 ("tap: accept an array of XDP buffs through sendmsg()") Cc: stable@vger.kernel.org Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com> Signed-off-by: Dongli Zhang <dongli.zhang@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-2-dongli.zhang@oracle.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit ed7f2af) Signed-off-by: Jeremy Allison <jallison@ciq.com>
There was a problem hiding this comment.
Similar to other commits in this series for CVE-2024-41090 - LGTM. Thanks!
|
I take back my approval - I missed the build log and kernel boot line with PREEMPT_RT? We like to see a build and boot log. Thanks! |
OK. I didn't know I needed that for RT. I'll re-build for the build log and get a boot log (that's just the dmsg output yeah ?). |
Thanks! I just run ../kernel-tools/kernel_build.sh skipkabi | tee > build.log for RT branches and after the build completes and reboots the VM you log in and run a simple 'uname -a' to show PREEMPT_RT. Oh, and post the beginning and end of the build log. |
Arg. Got pulled into an openssl CVE. Might take me a little while to get to this (just letting you know I haven't forgotten about it). |
|
Output from uname -a Linux r8_8_rt_lts 4.18.0-ciqlts8_8-rt+ #1 SMP PREEMPT_RT Fri Feb 7 21:52:38 UTC 2025 x86_64 x86_64 x86_64 GNU/Linux |
So long as you ran the kernel selftests under the PREEMPT_RT kernel, which is what i'm understanding to be the case, then approved. |
Yes. I run the selftests first under the original kernel, then boot into the new kernel and run again under the patched kernel (both using PREEMPT_RT in this branch). |
3 participants
kernel-selftest-rt-baseline-8.8.log
kernel-selftest-rt-8.8-patched.log
jira VULN-9072
cve CVE-2024-41090
commit-author Si-Wei Liu si-wei.liu@oracle.com
commit ed7f2af
The cited commit missed to check against the validity of the frame length in the tap_get_user_xdp() path, which could cause a corrupted skb to be sent downstack. Even before the skb is transmitted, the tap_get_user_xdp()-->skb_set_network_header() may assume the size is more 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, tap_get_user() already prohibits short frame which has the length less than Ethernet header size from being transmitted.
This is to drop any frame shorter than the Ethernet header size just like how tap_get_user() does.
CVE: CVE-2024-41090
Link: https://lore.kernel.org/netdev/1717026141-25716-1-git-send-email-si-wei.liu@oracle.com/ Fixes: 0efac27 ("tap: accept an array of XDP buffs through sendmsg()")
Cc: stable@vger.kernel.org
Signed-off-by: Si-Wei Liu si-wei.liu@oracle.com
Signed-off-by: Dongli Zhang dongli.zhang@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-2-dongli.zhang@oracle.com
Signed-off-by: Jakub Kicinski kuba@kernel.org
(cherry picked from commit ed7f2af)