From patchwork Sun Sep 10 13:22:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lebrun X-Patchwork-Id: 812136 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cteNbna2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xqsCH1TYJz9s83 for ; Sun, 10 Sep 2017 23:21:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751634AbdIJNV2 (ORCPT ); Sun, 10 Sep 2017 09:21:28 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35333 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751482AbdIJNV1 (ORCPT ); Sun, 10 Sep 2017 09:21:27 -0400 Received: by mail-wr0-f194.google.com with SMTP id n64so3240550wrb.2 for ; Sun, 10 Sep 2017 06:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=mOnde4wYREWsCAPU8OewpPkA7Tdrw6l62Nd2B4x2eVA=; b=cteNbna2utYJX4E3zig/5NpdixNIahqIni3Qn8Kwzh1FnJGgi+FMvu8APKRTdUuP1T YtBzoWXUp2vA7PrZcyhCLpVV6yydVY8HY19Kb3l/o2pErbFRJyNuvBR8csRxnwaC1PQ9 LMUrUI3U7ailQ2i7HCCvtb6eE+kuxJi0S0uOe/V9dzevPWsoDavJNeGGG9YMoxiJeaGE ME6XwwIoND65vnzI3U+fpPRzu5gaOlvp9F6jayjSv+JGFJqV5WXU/iEqteqK0C7o88b7 SwrVSIblqFTsUo+9A3jLalGWFZXKuWtHMDJUcVzeDuOPZBMwnfIiacn5zgxjLQFDN24n HqmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=mOnde4wYREWsCAPU8OewpPkA7Tdrw6l62Nd2B4x2eVA=; b=QI8ufnADLXWShM8Ejio6Wmv5To4G9GiWQPjaUStkBR4U76AOQnH92v3Hm9Ed/I3PlE Cxk4JuKFJ7oiAOOxXCCMEMvYa48UP6qz5jNMb9DX6lFphAKouaIW4xUdMABBK9aMtXqc d0h/w6TLur2JltWzca11Xj0Rw2kfPjBtFJhAkqyg7RGtzR8xjC/aat6LLFUuOvmxsBmc 2Br/6TDMmG+0TA3e5cFXp+bvwDfSBleAIuk9cBIw8iIaV/4zvVajqYaCdkoCLmTBHc0O JqQ3qp78CM877aRvLwxh1iaFxVzFbsPEpQByxw+1xie3k8A5kdbVYB8wiNeaJiJ0nXan EkPQ== X-Gm-Message-State: AHPjjUgJetVGaenrORDKuBwqY1izUe8AjCiNk1ayrWQDZlKIDoL20YjF iZUv7oReeUOvlPSWjIY= X-Google-Smtp-Source: ADKCNb4A/5gGMXJLOb2HyxRQ6W9mbSwAc2OoneRoi9tA26ZRyFjxf54+SaEzGe7BjuBkPifDnumneQ== X-Received: by 10.223.151.157 with SMTP id s29mr5679724wrb.168.1505049685986; Sun, 10 Sep 2017 06:21:25 -0700 (PDT) Received: from localhost.localdomain (shingan.ethylix.be. [194.110.69.82]) by smtp.gmail.com with ESMTPSA id r16sm11085591wrb.43.2017.09.10.06.21.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Sep 2017 06:21:25 -0700 (PDT) From: David Lebrun To: netdev@vger.kernel.org Subject: [PATCH net] ipv6: sr: remove duplicate routing header type check Date: Sun, 10 Sep 2017 14:22:01 +0100 Message-Id: <20170910132201.15576-1-dav.lebrun@gmail.com> X-Mailer: git-send-email 2.10.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Lebrun As seg6_validate_srh() already checks that the Routing Header type is correct, it is not necessary to do it again in get_srh(). Fixes: 5829d70b ("ipv6: sr: fix get_srh() to comply with IPv6 standard "RFC 8200") Signed-off-by: David Lebrun --- net/ipv6/seg6_local.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c index 7ff54db..825b8e0 100644 --- a/net/ipv6/seg6_local.c +++ b/net/ipv6/seg6_local.c @@ -72,10 +72,6 @@ static struct ipv6_sr_hdr *get_srh(struct sk_buff *skb) srh = (struct ipv6_sr_hdr *)(skb->data + srhoff); - /* make sure it's a Segment Routing header (Routing Type 4) */ - if (srh->type != IPV6_SRCRT_TYPE_4) - return NULL; - len = (srh->hdrlen + 1) << 3; if (!pskb_may_pull(skb, srhoff + len))