components/openvswitch/patches/07-ovsthread_key_destruct-fix.patch
author Mark Haywood <Mark.Haywood@Oracle.COM>
Tue, 05 Apr 2016 20:57:21 -0700
changeset 5730 cca4aa297e68
parent 5090 5f131162e136
child 6018 b5072b523988
permissions -rw-r--r--
22590644 OpenvSwitch should be updated to version 2.3.2 22557669 Openvswitch Multiple Uplink support 22634090 _ovs' user needs to have privilege to access datalink/flow sysevents 22725422 openvswitch package manifest file must have explicit dependency on rad-dlmgr 22920860 vswitch-server should start immediately after network/physical:default 22920351 datapath doesn't work for implicitly created OVS bridge VNIC 23020125 problem in SERVICE/OPENVSWITCH
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5090
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
     1
This patch fixes a bug in ovsthread_key_destruct__.
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
     2
5730
cca4aa297e68 22590644 OpenvSwitch should be updated to version 2.3.2
Mark Haywood <Mark.Haywood@Oracle.COM>
parents: 5090
diff changeset
     3
This patch has not been proposed upstream but will be proposed for 2.5.
5090
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
     4
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
     5
diff --git a/lib/ovs-thread.c b/lib/ovs-thread.c
5730
cca4aa297e68 22590644 OpenvSwitch should be updated to version 2.3.2
Mark Haywood <Mark.Haywood@Oracle.COM>
parents: 5090
diff changeset
     6
index 529756f..8b76eb9 100644
5090
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
     7
--- a/lib/ovs-thread.c
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
     8
+++ b/lib/ovs-thread.c
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
     9
@@ -641,8 +641,10 @@ ovsthread_key_destruct__(void *slots_)
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    10
     n = n_keys;
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    11
     ovs_mutex_unlock(&key_mutex);
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    12
 
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    13
-    for (i = 0; i < n / L2_SIZE; i++) {
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    14
-        free(slots->p1[i]);
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    15
+    if (n > 0) {
5730
cca4aa297e68 22590644 OpenvSwitch should be updated to version 2.3.2
Mark Haywood <Mark.Haywood@Oracle.COM>
parents: 5090
diff changeset
    16
+        for (i = 0; i <= (n - 1) / L2_SIZE; i++) {
cca4aa297e68 22590644 OpenvSwitch should be updated to version 2.3.2
Mark Haywood <Mark.Haywood@Oracle.COM>
parents: 5090
diff changeset
    17
+            free(slots->p1[i]);
cca4aa297e68 22590644 OpenvSwitch should be updated to version 2.3.2
Mark Haywood <Mark.Haywood@Oracle.COM>
parents: 5090
diff changeset
    18
+         }
5090
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    19
     }
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    20
     free(slots);
5f131162e136 PSARC/2015/311 Open vSwitch (OVS)
Mark Haywood <Mark.Haywood@Oracle.COM>
parents:
diff changeset
    21
 }