OSDN Git Service

can: Remove SKB list assumptions in rx-offload.c
authorDavid S. Miller <davem@davemloft.net>
Wed, 22 Aug 2018 23:43:34 +0000 (16:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 10 Sep 2018 17:06:54 +0000 (10:06 -0700)
Eliminate code which assumes that SKBs and skb_queue_head objects
can be cast to eachother during list processing.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/can/rx-offload.c

index d94dae2..c7d0502 100644 (file)
@@ -79,7 +79,7 @@ static int can_rx_offload_napi_poll(struct napi_struct *napi, int quota)
 static inline void __skb_queue_add_sort(struct sk_buff_head *head, struct sk_buff *new,
                                        int (*compare)(struct sk_buff *a, struct sk_buff *b))
 {
-       struct sk_buff *pos, *insert = (struct sk_buff *)head;
+       struct sk_buff *pos, *insert = NULL;
 
        skb_queue_reverse_walk(head, pos) {
                const struct can_rx_offload_cb *cb_pos, *cb_new;
@@ -99,8 +99,10 @@ static inline void __skb_queue_add_sort(struct sk_buff_head *head, struct sk_buf
                insert = pos;
                break;
        }
-
-       __skb_queue_after(head, insert, new);
+       if (!insert)
+               __skb_queue_head(head, new);
+       else
+               __skb_queue_after(head, insert, new);
 }
 
 static int can_rx_offload_compare(struct sk_buff *a, struct sk_buff *b)