pktgen: fix module unload for good
authorEric Dumazet <edumazet@google.com>
Thu, 17 May 2012 23:52:26 +0000 (23:52 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 May 2012 17:54:33 +0000 (13:54 -0400)
commit c57b5468406 (pktgen: fix crash at module unload) did a very poor
job with list primitives.

1) list_splice() arguments were in the wrong order

2) list_splice(list, head) has undefined behavior if head is not
initialized.

3) We should use the list_splice_init() variant to clear pktgen_threads
list.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/pktgen.c

index 77a59980b5792323db66f88ebcdb746dccfd2d7f..b81369b6ddc06e1056e8d3283241ff7d56b27fa6 100644 (file)
@@ -3755,13 +3755,13 @@ static void __exit pg_cleanup(void)
 {
        struct pktgen_thread *t;
        struct list_head *q, *n;
-       struct list_head list;
+       LIST_HEAD(list);
 
        /* Stop all interfaces & threads */
        pktgen_exiting = true;
 
        mutex_lock(&pktgen_thread_lock);
-       list_splice(&list, &pktgen_threads);
+       list_splice_init(&pktgen_threads, &list);
        mutex_unlock(&pktgen_thread_lock);
 
        list_for_each_safe(q, n, &list) {