From patchwork Thu Nov 7 16:53:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florent Fourcot X-Patchwork-Id: 289441 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9B5012C008E for ; Fri, 8 Nov 2013 03:53:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754044Ab3KGQxZ (ORCPT ); Thu, 7 Nov 2013 11:53:25 -0500 Received: from fourcot.fr ([217.70.191.14]:34531 "EHLO olfflo.fourcot.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753492Ab3KGQxT (ORCPT ); Thu, 7 Nov 2013 11:53:19 -0500 Received: from reglisse.fourcot.fr (seg75-1-89-88-184-100.dsl.sta.abo.bbox.fr [89.88.184.100]) (Authenticated sender: reglisse) by olfflo.fourcot.fr (Postfix) with ESMTPSA id AEA8D2E335; Thu, 7 Nov 2013 17:53:18 +0100 (CET) Received: by reglisse.fourcot.fr (Postfix, from userid 1000) id 589FF756C70; Thu, 7 Nov 2013 17:53:18 +0100 (CET) From: Florent Fourcot To: netdev@vger.kernel.org Cc: Florent Fourcot Subject: [PATCH net-next v2 3/3] ipv6: protect flow label renew against GC Date: Thu, 7 Nov 2013 17:53:14 +0100 Message-Id: <1383843194-22945-3-git-send-email-florent.fourcot@enst-bretagne.fr> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1383843194-22945-1-git-send-email-florent.fourcot@enst-bretagne.fr> References: <1383843194-22945-1-git-send-email-florent.fourcot@enst-bretagne.fr> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Take ip6_fl_lock before to read and update a label. v2: protect only the relevant code Reported-by: Hannes Frederic Sowa Signed-off-by: Florent Fourcot Acked-by: Hannes Frederic Sowa --- net/ipv6/ip6_flowlabel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index 5f10b0d..98fdcc6 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -345,6 +345,8 @@ static int fl6_renew(struct ip6_flowlabel *fl, unsigned long linger, unsigned lo expires = check_linger(expires); if (!expires) return -EPERM; + + spin_lock_bh(&ip6_fl_lock); fl->lastuse = jiffies; if (time_before(fl->linger, linger)) fl->linger = linger; @@ -352,6 +354,8 @@ static int fl6_renew(struct ip6_flowlabel *fl, unsigned long linger, unsigned lo expires = fl->linger; if (time_before(fl->expires, fl->lastuse + expires)) fl->expires = fl->lastuse + expires; + spin_unlock_bh(&ip6_fl_lock); + return 0; }