Skip to content

Commit

Permalink
tap: add missing verification for short frame
Browse files Browse the repository at this point in the history
jira VULN-9073
cve CVE-2024-41090
commit-author Si-Wei Liu <[email protected]>
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/[email protected]/
Fixes: 0efac27 ("tap: accept an array of XDP buffs through sendmsg()")
	Cc: [email protected]
	Signed-off-by: Si-Wei Liu <[email protected]>
	Signed-off-by: Dongli Zhang <[email protected]>
	Reviewed-by: Willem de Bruijn <[email protected]>
	Reviewed-by: Paolo Abeni <[email protected]>
	Reviewed-by: Jason Wang <[email protected]>
Link: https://patch.msgid.link/[email protected]
	Signed-off-by: Jakub Kicinski <[email protected]>
(cherry picked from commit ed7f2af)

Signed-off-by: Jeremy Allison <[email protected]>
  • Loading branch information
jallisonciq committed Feb 12, 2025
1 parent 1e4f620 commit 71b3099
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions drivers/net/tap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1154,6 +1154,11 @@ static int tap_get_user_xdp(struct tap_queue *q, struct xdp_buff *xdp)
struct sk_buff *skb;
int err, depth;

if (unlikely(xdp->data_end - xdp->data < ETH_HLEN)) {
err = -EINVAL;
goto err;
}

if (q->flags & IFF_VNET_HDR)
vnet_hdr_len = READ_ONCE(q->vnet_hdr_sz);

Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ source "$lib_dir"/lag_lib.sh

destroy()
{
local ifnames=(dummy1 dummy2 team0 mv0)
local ifnames=(dummy0 dummy1 team0 mv0)
local ifname

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

0 comments on commit 71b3099

Please sign in to comment.