From patchwork Wed Jul 22 09:18:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guodeqing (A)" X-Patchwork-Id: 1333694 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BBVPl4Rmtz9sRN for ; Wed, 22 Jul 2020 19:23:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731271AbgGVJXW (ORCPT ); Wed, 22 Jul 2020 05:23:22 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:7813 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728360AbgGVJXW (ORCPT ); Wed, 22 Jul 2020 05:23:22 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id B51F97DE6915831AF274; Wed, 22 Jul 2020 17:23:19 +0800 (CST) Received: from huawei.com (10.179.179.12) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.487.0; Wed, 22 Jul 2020 17:23:10 +0800 From: guodeqing To: CC: , , , , Subject: [PATCH,v2] ipvlan: add the check of ip header checksum Date: Wed, 22 Jul 2020 17:18:19 +0800 Message-ID: <1595409499-25008-1-git-send-email-geffrey.guo@huawei.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.179.179.12] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ip header checksum can be error in the following steps. $ ip netns add ns1 $ ip link add gw link eth0 type ipvlan $ ip addr add 168.16.0.1/24 dev gw $ ip link set dev gw up $ ip link add ip1 link eth0 type ipvlan $ ip link set ip1 netns ns1 $ ip netns exec ns1 ip link set ip1 up $ ip netns exec ns1 ip addr add 168.16.0.2/24 dev ip1 $ ip netns exec ns1 tc qdisc add dev ip1 root netem corrupt 50% $ ip netns exec ns1 ping 168.16.0.1 This is because the netem will modify the packet randomly. the corrupted packets should be dropped derectly, otherwise it may cause a problem. Here I add the check of ip header checksum and drop the illegal packets in l3/l3s mode. Signed-off-by: guodeqing --- drivers/net/ipvlan/ipvlan_core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index 8801d09..ccf3193 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -160,6 +160,10 @@ void *ipvlan_get_L3_hdr(struct ipvl_port *port, struct sk_buff *skb, int *type) pktlen = ntohs(ip4h->tot_len); if (ip4h->ihl < 5 || ip4h->version != 4) return NULL; + + if (unlikely(ip_fast_csum((u8 *)ip4h, ip4h->ihl))) + return NULL; + if (skb->len < pktlen || pktlen < (ip4h->ihl * 4)) return NULL; @@ -569,8 +573,10 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev) int addr_type; lyr3h = ipvlan_get_L3_hdr(ipvlan->port, skb, &addr_type); - if (!lyr3h) - goto out; + if (!lyr3h) { + kfree_skb(skb); + return NET_XMIT_DROP; + } if (!ipvlan_is_vepa(ipvlan->port)) { addr = ipvlan_addr_lookup(ipvlan->port, lyr3h, addr_type, true); @@ -582,7 +588,7 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev) return ipvlan_rcv_frame(addr, &skb, true); } } -out: + ipvlan_skb_crossing_ns(skb, ipvlan->phy_dev); return ipvlan_process_outbound(skb); }