idpf: fix potential use-after-free in idpf_tso()
authorEric Dumazet <edumazet@google.com>
Fri, 3 Nov 2023 20:04:51 +0000 (20:04 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 7 Nov 2023 01:24:37 +0000 (17:24 -0800)
skb_cow_head() can change skb->head (and thus skb_shinfo(skb))

We must not cache skb_shinfo(skb) before skb_cow_head().

Fixes: 6818c4d5b3c2 ("idpf: add splitq start_xmit")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Joshua Hay <joshua.a.hay@intel.com>
Cc: Alan Brady <alan.brady@intel.com>
Cc: Madhu Chittim <madhu.chittim@intel.com>
Cc: Phani Burra <phani.r.burra@intel.com>
Cc: Sridhar Samudrala <sridhar.samudrala@intel.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Pavan Kumar Linga <pavan.kumar.linga@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: Bailey Forrest <bcf@google.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231103200451.514047-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/intel/idpf/idpf_txrx.c

index 5e1ef70d54fe4147a42e5a3263b73cd3e6316679..1f728a9004d9e40d4434534422a42c8c537f5eae 100644 (file)
@@ -2365,7 +2365,7 @@ static void idpf_tx_splitq_map(struct idpf_queue *tx_q,
  */
 int idpf_tso(struct sk_buff *skb, struct idpf_tx_offload_params *off)
 {
-       const struct skb_shared_info *shinfo = skb_shinfo(skb);
+       const struct skb_shared_info *shinfo;
        union {
                struct iphdr *v4;
                struct ipv6hdr *v6;
@@ -2379,13 +2379,15 @@ int idpf_tso(struct sk_buff *skb, struct idpf_tx_offload_params *off)
        u32 paylen, l4_start;
        int err;
 
-       if (!shinfo->gso_size)
+       if (!skb_is_gso(skb))
                return 0;
 
        err = skb_cow_head(skb, 0);
        if (err < 0)
                return err;
 
+       shinfo = skb_shinfo(skb);
+
        ip.hdr = skb_network_header(skb);
        l4.hdr = skb_transport_header(skb);