From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162473Ab1FAIU5 (ORCPT ); Wed, 1 Jun 2011 04:20:57 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43943 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161810Ab1FAIUu (ORCPT ); Wed, 1 Jun 2011 04:20:50 -0400 X-Mailbox-Line: From linux@blue.kroah.org Wed Jun 1 17:11:28 2011 Message-Id: <20110601081128.204198782@blue.kroah.org> User-Agent: quilt/0.48-16.4 Date: Wed, 01 Jun 2011 17:10:35 +0900 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Eric Dumazet , "David S. Miller" , Greg Kroah-Hartman Subject: [065/165] net: fix __dst_destroy_metrics_generic() In-Reply-To: <20110601081349.GA10017@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.39-stable review patch. If anyone has any objections, please let us know. ------------------ Content-Length: 760 Lines: 26 From: Eric Dumazet [ Upstream commit b30c516f875004f025f4d10147bde28c5e98466b ] dst_default_metrics is readonly, we dont want to kfree() it later. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- 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));