Skip to content

Commit 71b3099

Browse files
committed
tap: add missing verification for short frame
jira VULN-9073 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>
1 parent 1e4f620 commit 71b3099

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

drivers/net/tap.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,11 @@ static int tap_get_user_xdp(struct tap_queue *q, struct xdp_buff *xdp)
11541154
struct sk_buff *skb;
11551155
int err, depth;
11561156

1157+
if (unlikely(xdp->data_end - xdp->data < ETH_HLEN)) {
1158+
err = -EINVAL;
1159+
goto err;
1160+
}
1161+
11571162
if (q->flags & IFF_VNET_HDR)
11581163
vnet_hdr_len = READ_ONCE(q->vnet_hdr_sz);
11591164

tools/testing/selftests/drivers/net/team/dev_addr_lists.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ source "$lib_dir"/lag_lib.sh
1818

1919
destroy()
2020
{
21-
local ifnames=(dummy1 dummy2 team0 mv0)
21+
local ifnames=(dummy0 dummy1 team0 mv0)
2222
local ifname
2323

2424
for ifname in "${ifnames[@]}"; do

0 commit comments

Comments
 (0)