]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
net: fix __dst_destroy_metrics_generic()
authorEric Dumazet <eric.dumazet@gmail.com>
Tue, 24 May 2011 17:29:50 +0000 (13:29 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Jun 2011 00:31:58 +0000 (09:31 +0900)
[ Upstream commit b30c516f875004f025f4d10147bde28c5e98466b ]

dst_default_metrics is readonly, we dont want to kfree() it later.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/core/dst.c

index 91104d35de7d9d6f7d276e8ae02b833e5ddc4338..b71b7a30fd739354f74109b71358df31db865af4 100644 (file)
@@ -314,7 +314,7 @@ void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old)
 {
        unsigned long prev, new;
 
-       new = (unsigned long) dst_default_metrics;
+       new = ((unsigned long) dst_default_metrics) | DST_METRICS_READ_ONLY;
        prev = cmpxchg(&dst->_metrics, old, new);
        if (prev == old)
                kfree(__DST_METRICS_PTR(old));