| Date | Wed, 01 Jun 2011 17:10:35 +0900 | From | Greg KH <> | Subject | [065/165] net: fix __dst_destroy_metrics_generic() |
| |
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------ Content-Length: 760 Lines: 26
From: Eric Dumazet <eric.dumazet@gmail.com>
[ 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/core/dst.c +++ b/net/core/dst.c @@ -314,7 +314,7 @@ void __dst_destroy_metrics_generic(struc { 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));
|