1 files changed, 48 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.18/0055-pktgen-fix-module-unload-for-good.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.18/0055-pktgen-fix-module-unload-for-good.patch
new file mode 100644
index 00000000..1f86f355
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.18/0055-pktgen-fix-module-unload-for-good.patch
@@ -0,0 +1,48 @@
+From 20b87e11f8ebb8b1fa74b668770c7f2b301b40b4 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Thu, 17 May 2012 23:52:26 +0000
+Subject: [PATCH 55/56] pktgen: fix module unload for good
+
+commit d4b1133558e0d417342d5d2c49e4c35b428ff20d upstream.
+
+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>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ net/core/pktgen.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/core/pktgen.c b/net/core/pktgen.c
+index 657e5f9..df878de 100644
+--- a/net/core/pktgen.c
++++ b/net/core/pktgen.c
+@@ -3758,13 +3758,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) {
+-- 
+1.7.7.6
+