From patchwork Tue May 19 22:56:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hlusiak X-Patchwork-Id: 27428 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id CCFDCB7067 for ; Wed, 20 May 2009 08:55:46 +1000 (EST) Received: by ozlabs.org (Postfix) id B76DEDE164; Wed, 20 May 2009 08:55:46 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 59836DE163 for ; Wed, 20 May 2009 08:55:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753441AbZESWzj (ORCPT ); Tue, 19 May 2009 18:55:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752893AbZESWzj (ORCPT ); Tue, 19 May 2009 18:55:39 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:49236 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910AbZESWzi (ORCPT ); Tue, 19 May 2009 18:55:38 -0400 Received: from localhost.localdomain (g226199194.adsl.alicedsl.de [92.226.199.194]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MKv1o-1M6YDi3XmO-000jOP; Wed, 20 May 2009 00:55:39 +0200 From: Sascha Hlusiak To: netdev@vger.kernel.org Cc: Sascha Hlusiak Subject: [PATCH 1/5] sit: Fail to create tunnel, if it already exists Date: Wed, 20 May 2009 00:56:48 +0200 Message-Id: <1242773812-9328-1-git-send-email-contact@saschahlusiak.de> X-Mailer: git-send-email 1.6.3 X-Provags-ID: V01U2FsdGVkX1/yETSR16poSc5yMnsJSzyDPrIc09CevJtjeJo LDQRxnpj0lEwz5USv5tRvcMeyBc9BSahmEqAuWovEwj010XSqd eRxzYXMXd7BAS7rN0m8i6R17fBMgMfk Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When locating the tunnel, do not continue if it is found. Otherwise a different tunnel with similar configuration would be returned and parts could be overwritten. Signed-off-by: Sascha Hlusiak --- net/ipv6/sit.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 664ab82..e625041 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -165,8 +165,13 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net, struct sit_net *sitn = net_generic(net, sit_net_id); for (tp = __ipip6_bucket(sitn, parms); (t = *tp) != NULL; tp = &t->next) { - if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr) - return t; + if (local == t->parms.iph.saddr && + remote == t->parms.iph.daddr) { + if (create) + return NULL; + else + return t; + } } if (!create) goto failed;