Skip to content

Commit 7c68d1a

Browse files
Eric Dumazetdavem330
authored andcommitted
net: qdisc_pkt_len_init() should be more robust
Without proper validation of DODGY packets, we might very well feed qdisc_pkt_len_init() with invalid GSO packets. tcp_hdrlen() might access out-of-bound data, so let's use skb_header_pointer() and proper checks. Whole story is described in commit d0c081b ("flow_dissector: properly cap thoff field") We have the goal of validating DODGY packets earlier in the stack, so we might very well revert this fix in the future. Signed-off-by: Eric Dumazet <[email protected]> Cc: Willem de Bruijn <[email protected]> Cc: Jason Wang <[email protected]> Reported-by: [email protected] Acked-by: Jason Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 18b0aff commit 7c68d1a

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

net/core/dev.c

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3151,10 +3151,21 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
31513151
hdr_len = skb_transport_header(skb) - skb_mac_header(skb);
31523152

31533153
/* + transport layer */
3154-
if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))
3155-
hdr_len += tcp_hdrlen(skb);
3156-
else
3157-
hdr_len += sizeof(struct udphdr);
3154+
if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) {
3155+
const struct tcphdr *th;
3156+
struct tcphdr _tcphdr;
3157+
3158+
th = skb_header_pointer(skb, skb_transport_offset(skb),
3159+
sizeof(_tcphdr), &_tcphdr);
3160+
if (likely(th))
3161+
hdr_len += __tcp_hdrlen(th);
3162+
} else {
3163+
struct udphdr _udphdr;
3164+
3165+
if (skb_header_pointer(skb, skb_transport_offset(skb),
3166+
sizeof(_udphdr), &_udphdr))
3167+
hdr_len += sizeof(struct udphdr);
3168+
}
31583169

31593170
if (shinfo->gso_type & SKB_GSO_DODGY)
31603171
gso_segs = DIV_ROUND_UP(skb->len - hdr_len,

0 commit comments

Comments
 (0)