Skip to content

Commit ac01049

Browse files
committed
tap: add missing verification for short frame
JIRA: https://issues.redhat.com/browse/RHEL-50265 CVE: CVE-2024-41090 Upstream Status: Posted https://lore.kernel.org/all/20240724170452.16837-2-dongli.zhang@oracle.com/ Author: Si-Wei Liu <si-wei.liu@oracle.com> Date: Wed Jul 24 10:04:51 2024 -0700 tap: add missing verification for short frame 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> Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
1 parent e8f3b45 commit ac01049

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/net/tap.c

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

1160+
if (unlikely(xdp->data_end - xdp->data < ETH_HLEN)) {
1161+
err = -EINVAL;
1162+
goto err;
1163+
}
1164+
11601165
if (q->flags & IFF_VNET_HDR)
11611166
vnet_hdr_len = READ_ONCE(q->vnet_hdr_sz);
11621167

0 commit comments

Comments
 (0)