From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60166C43381 for ; Wed, 20 Feb 2019 15:52:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 310B02086D for ; Wed, 20 Feb 2019 15:52:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vf9fsLHG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727607AbfBTPwS (ORCPT ); Wed, 20 Feb 2019 10:52:18 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:43031 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727300AbfBTPwR (ORCPT ); Wed, 20 Feb 2019 10:52:17 -0500 Received: by mail-qk1-f196.google.com with SMTP id f196so2243775qke.10 for ; Wed, 20 Feb 2019 07:52:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yv1znx20vCjUadf0n5SEoY/4D09XFZrI/BaFlo7trlc=; b=vf9fsLHGzsJQVG8JTjNvQuccUu15KwTlyIORlEotSRL2TeqwVHRMPOXwCECIgVMv0N Eprp8ai6BbOxYuC0X/hwb0mqpcvUswRI+uh8KqroFwYUBBew0SVQCoYe35HEn/dyDMvw UFIal7RTk0btWzmUdhc64wusikHN5VduY3xyjaSORo6CGApiCCZq9vWjsVwmhofBHhfS T3EsgGNDsaCDI0UU7X/SbE3UeHzhIQ4mt+MFpx69cWdf4KhdmfQxR1oDBjYujVDQEKf5 xsz/IJc2uxVo03gd5V0JcDZOyxu5oNyZcBa3RIyJTGMm7SDExrwrBRcq2bfZwv8xYgpo +JUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yv1znx20vCjUadf0n5SEoY/4D09XFZrI/BaFlo7trlc=; b=TfkAJesjAe+MI1HNiFY/eIWozJGbRZauZW78Jlw/AqZPdXLoJfdCnchw9yq627BVlu +ZRa8RKtnPAKfKbph9Y/v1ldmOxv71eixEhi/I4dT1dxsUgniyk/bIjyQrXePZduRMfT +1z9yGeTZEXDYsphD7OZbpspQeugi0TL0CtQjkhRZfvAaSiHCkIG5FSmCWtIEgmKvnea EMbzwEtrr8jOtEAHd3vYKFITuqenWPTescLmzkvfXXmguWfGaeOTk88ojKZa9YMLadWy FDSNKQVNRV+JX22e/C8Z5rAVFSHAi71u6Uzhv36Xs9Oicg928EoIPDPOsZxHz1Qn/Nk4 awug== X-Gm-Message-State: AHQUAubNLAKsweQNzxKdz+42Qoicgo2CXp9uiTO20mXldVCvyVxaqbgl mAX1HpX6k0M5Q6s32BBY6bco95xE X-Google-Smtp-Source: AHgI3IbybEpDIKr9JZBbu7ZSaWkeq3MEhGyW3LIInlxIPC4UDpTKZHCK7wUO01qlDNIsvAJERJZgFw== X-Received: by 2002:a05:620a:122e:: with SMTP id v14mr25199497qkj.105.1550677935885; Wed, 20 Feb 2019 07:52:15 -0800 (PST) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id l16sm11200363qke.20.2019.02.20.07.52.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Feb 2019 07:52:14 -0800 (PST) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: davem@davemloft.net, Willem de Bruijn Subject: [PATCH net-next] gso: validate gso_type on ipip style tunnels Date: Wed, 20 Feb 2019 10:52:12 -0500 Message-Id: <20190220155212.47248-1-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.rc0.258.g878e2cd30e-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn Commit 121d57af308d ("gso: validate gso_type in GSO handlers") added gso_type validation to existing gso_segment callback functions, to filter out illegal and potentially dangerous SKB_GSO_DODGY packets. Convert tunnels that now call inet_gso_segment and ipv6_gso_segment directly to have their own callbacks and extend validation to these. Signed-off-by: Willem de Bruijn --- net/ipv4/af_inet.c | 11 ++++++++++- net/ipv6/ip6_offload.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 0dfb72c46671..eab3ebde981e 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1385,6 +1385,15 @@ struct sk_buff *inet_gso_segment(struct sk_buff *skb, } EXPORT_SYMBOL(inet_gso_segment); +static struct sk_buff *ipip_gso_segment(struct sk_buff *skb, + netdev_features_t features) +{ + if (!(skb_shinfo(skb)->gso_type & SKB_GSO_IPXIP4)) + return ERR_PTR(-EINVAL); + + return inet_gso_segment(skb, features); +} + INDIRECT_CALLABLE_DECLARE(struct sk_buff *tcp4_gro_receive(struct list_head *, struct sk_buff *)); INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp4_gro_receive(struct list_head *, @@ -1861,7 +1870,7 @@ static struct packet_offload ip_packet_offload __read_mostly = { static const struct net_offload ipip_offload = { .callbacks = { - .gso_segment = inet_gso_segment, + .gso_segment = ipip_gso_segment, .gro_receive = ipip_gro_receive, .gro_complete = ipip_gro_complete, }, diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index 5c045691c302..345882d9c061 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -383,9 +383,36 @@ static struct packet_offload ipv6_packet_offload __read_mostly = { }, }; +static struct sk_buff *sit_gso_segment(struct sk_buff *skb, + netdev_features_t features) +{ + if (!(skb_shinfo(skb)->gso_type & SKB_GSO_IPXIP4)) + return ERR_PTR(-EINVAL); + + return ipv6_gso_segment(skb, features); +} + +static struct sk_buff *ip4ip6_gso_segment(struct sk_buff *skb, + netdev_features_t features) +{ + if (!(skb_shinfo(skb)->gso_type & SKB_GSO_IPXIP6)) + return ERR_PTR(-EINVAL); + + return inet_gso_segment(skb, features); +} + +static struct sk_buff *ip6ip6_gso_segment(struct sk_buff *skb, + netdev_features_t features) +{ + if (!(skb_shinfo(skb)->gso_type & SKB_GSO_IPXIP6)) + return ERR_PTR(-EINVAL); + + return ipv6_gso_segment(skb, features); +} + static const struct net_offload sit_offload = { .callbacks = { - .gso_segment = ipv6_gso_segment, + .gso_segment = sit_gso_segment, .gro_receive = sit_ip6ip6_gro_receive, .gro_complete = sit_gro_complete, }, @@ -393,7 +420,7 @@ static const struct net_offload sit_offload = { static const struct net_offload ip4ip6_offload = { .callbacks = { - .gso_segment = inet_gso_segment, + .gso_segment = ip4ip6_gso_segment, .gro_receive = ip4ip6_gro_receive, .gro_complete = ip4ip6_gro_complete, }, @@ -401,7 +428,7 @@ static const struct net_offload ip4ip6_offload = { static const struct net_offload ip6ip6_offload = { .callbacks = { - .gso_segment = ipv6_gso_segment, + .gso_segment = ip6ip6_gso_segment, .gro_receive = sit_ip6ip6_gro_receive, .gro_complete = ip6ip6_gro_complete, }, -- 2.21.0.rc0.258.g878e2cd30e-goog