From patchwork Fri May 15 12:52:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hlusiak X-Patchwork-Id: 27251 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 9466EB6F44 for ; Fri, 15 May 2009 22:52:22 +1000 (EST) Received: by ozlabs.org (Postfix) id 85DB6DE107; Fri, 15 May 2009 22:52:22 +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 21702DE106 for ; Fri, 15 May 2009 22:52:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754241AbZEOMwK (ORCPT ); Fri, 15 May 2009 08:52:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753608AbZEOMwJ (ORCPT ); Fri, 15 May 2009 08:52:09 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:55138 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753332AbZEOMwI (ORCPT ); Fri, 15 May 2009 08:52:08 -0400 Received: from localhost.localdomain (g228068143.adsl.alicedsl.de [92.228.68.143]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MKv5w-1M4wtO2QaU-0001CF; Fri, 15 May 2009 14:52:07 +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: Fri, 15 May 2009 14:52:47 +0200 Message-Id: <1242391971-32583-1-git-send-email-contact@saschahlusiak.de> X-Mailer: git-send-email 1.6.3 X-Provags-ID: V01U2FsdGVkX18eKdTNo1GALEA4ZxXW21kvhiMQ5lMQ/zvRd3+ IKombOOewfJZKpVnG1hwOh7QomyVf796AQJvKAgx8KwjEOBL48 iTrklbLnpGrvJCeyuyb/oqtd9zc+Kwh 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. --- net/ipv6/sit.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 664ab82..bd63a7e 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;