From patchwork Wed Mar 7 01:56:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 882364 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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V+gNoMv0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zwxbm1ntBz9s7c for ; Wed, 7 Mar 2018 12:57:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932448AbeCGB5V (ORCPT ); Tue, 6 Mar 2018 20:57:21 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:41282 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932078AbeCGB5U (ORCPT ); Tue, 6 Mar 2018 20:57:20 -0500 Received: by mail-pl0-f65.google.com with SMTP id d9-v6so438864plo.8 for ; Tue, 06 Mar 2018 17:57:20 -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; bh=68Lu7oWuGqNuoz0gklHSO6ac3BjrPsf2E1vznOZA0Fw=; b=V+gNoMv0LzFD5VJCvgrRqPW/rynLgAWOqifSZYQ72FoRQYd8lleJEuUsR3bpgq0PSu YpZ50iBiVd9zAq5IftbnIPBsWAeifW+X8q/Tkb8+OTQ/kh/OgIZkuYO48Ic965YTkLJk 8zDSwg8IUE+SRgVsgzdme6cJX/ES5I4FWE/uV81Re43nJILnlzzITf1Qh8K4mu9guyrS C37Yzs7cH5+WNl9smObAEvh//ZzX0agerMiAiSLyUxJ4kmGQk0tYV+tv673xHQc9pS8U StUpg4fv+QhW1SXmwxAq3SIHIfNWIF+c/VpzGvvynFAz+NXvDOCyaqn33pWWvAQGrGJp B+Bg== 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; bh=68Lu7oWuGqNuoz0gklHSO6ac3BjrPsf2E1vznOZA0Fw=; b=CwqSSa03FeMxqzneZMTT17BELts8fc5+iHCFT1r3ZrLidf2mHZASt3hwMhfgVcMtyF 7ADru+/tFAwGbojz8wM8AVH/euDvg5OPIglZc554Vp1cyCamugKEczMZmUq3wuxx+iRl C9uBO0QvxEfp/vwY1z0SIrRMiYZ+U1RnO2h7im1/PUUyGrus+yw/4htwA/0WudqLxk8J Oa/Mq1Qy/Lq8AHJNNO0EsxamU4DAwwr6jWbNjPkUB9h8sxRDxj4vmKYR8Ck2f9+xkscN Zy9jDcMlkbB/CkF4I0WDtlN5pjwdXMrA46v9i7C/4226gMXoic6z6i+bTkLpTFlJAX/5 Ng9w== X-Gm-Message-State: APf1xPDHAHbckYzv07DQSzW68bDciB/DQSCtSh0QNea/1pMrdn/hnmkP B+JbZKLoiYsNc1vEV+i5cnDOzOJe X-Google-Smtp-Source: AG47ELt5zPuPzhJCzdmncglHa30cB+hCKnEbUqd9AZS4KjheI1XGCA5ZsLQpypD4268HCP2A5y+d8Q== X-Received: by 2002:a17:902:9009:: with SMTP id a9-v6mr18241373plp.272.1520387839646; Tue, 06 Mar 2018 17:57:19 -0800 (PST) Received: from william-virtual-machine.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id b123sm32026332pfb.179.2018.03.06.17.57.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 17:57:19 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Cc: pshelar@ovn.org, jbenc@redhat.com Subject: [PATCH net-next] openvswitch: fix vport packet length check. Date: Tue, 6 Mar 2018 17:56:57 -0800 Message-Id: <1520387817-11137-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When sending a packet to a tunnel device, the dev's hard_header_len could be larger than the skb->len in function packet_length(). In the case of ip6gretap/erspan, hard_header_len = LL_MAX_HEADER + t_hlen, which is around 180, and an ARP packet sent to this tunnel has skb->len = 42. This causes the 'unsign int length' to become super large because it is negative value, causing the later ovs_vport_send to drop it due to over-mtu size. The patch fixes it by setting it to 0. Signed-off-by: William Tu --- net/openvswitch/vport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index b6c8524032a0..7718d5b4cf8a 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -467,7 +467,7 @@ int ovs_vport_receive(struct vport *vport, struct sk_buff *skb, static unsigned int packet_length(const struct sk_buff *skb, struct net_device *dev) { - unsigned int length = skb->len - dev->hard_header_len; + int length = skb->len - dev->hard_header_len; if (!skb_vlan_tag_present(skb) && eth_type_vlan(skb->protocol)) @@ -478,7 +478,7 @@ static unsigned int packet_length(const struct sk_buff *skb, * account for 802.1ad. e.g. is_skb_forwardable(). */ - return length; + return length > 0 ? length : 0; } void ovs_vport_send(struct vport *vport, struct sk_buff *skb, u8 mac_proto)