From patchwork Thu Oct 5 00:14:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 821540 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=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QgCRHj5I"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y6tYW2SZ9z9sMN for ; Thu, 5 Oct 2017 11:14:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751247AbdJEAOV (ORCPT ); Wed, 4 Oct 2017 20:14:21 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33699 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbdJEAOU (ORCPT ); Wed, 4 Oct 2017 20:14:20 -0400 Received: by mail-wm0-f65.google.com with SMTP id u138so8309816wmu.0 for ; Wed, 04 Oct 2017 17:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xzi/BuG07IYgV+kfWICtj8wtvW6LOe7L0uXDyPzkCWg=; b=QgCRHj5IXVpNzZZuX7goZ7hI1xdC1A4IDrlJieZM7Rs0sgNQl+CoZkoHPdwoFGyh9X pDUxLprdDdzAqmy2k0xinceMT/BRVjf0tYKNBDS8rFZMhbRhk8cKTTkQmtcPyvid45BC mTsw+r4D+uijPVHBiSGylkJLb0N6OSG36nMtqNO2hKFaBm0Ke3MykknZ9qgbBWBraYNR SmDvKXtWYzFLRhVo75QkbDAfnT//Xqj4Ft3Ijg/IQ4Cz80NsDLEGO/nhfw9QIkG+RtRg yjvyM0AnsoGRb1hewT5sVRO/d9VHTbk0bRThb7s/KpVNqo5UScPA7x/liksJbrQrRgVY EEng== 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=xzi/BuG07IYgV+kfWICtj8wtvW6LOe7L0uXDyPzkCWg=; b=evmJ9AdxAn26q5YeQ6bquZKwFZP5op1RckUSZvZE7pWQiofRFTrVC3AgT+c2+XY63X Kd1q4gGRV69pa05CS7zfEUopUmrUsnzOYLWG8keCh5kptyNxfxx6xQCTzKIrIS/oWSrP XM9fCz5SCO8gqKgAYstyXngVXbnPJIyv2/2lWfxANpvaWfdlvTUSDCOsZcZAn/k1MidX 8Ujh7H3LxinnykzYqLY4SUnhpuGzqgYQcYB2wm9JFygrqfYyd6aT68f1t8Wy4HuifqDQ 0Tm/LEIiE3ojWEZwJODkHDg8IrTxJfW6rQB8zyW+sMEUZn0fSzRTne6nHLLtV9ItIWF8 j6vA== X-Gm-Message-State: AMCzsaVBaUI5h+1bdGgOInSkKKygKxg517g49egiQRTN+kt4+tYNc8Wr Zd/3ddcgCz99YoS0aFdonZNAnHZ7 X-Google-Smtp-Source: AOwi7QCaKDIFiH39EJnolJOw3SmivkNwsR/4kmy9aDqukNcGwp5jnRx2s4Mnh4CoA53lZWDJZIZBOg== X-Received: by 10.80.172.5 with SMTP id v5mr5003257edc.91.1507162459138; Wed, 04 Oct 2017 17:14:19 -0700 (PDT) Received: from sc9-mailhost1.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id h56sm17207761ede.15.2017.10.04.17.14.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 17:14:18 -0700 (PDT) From: William Tu To: netdev@vger.kernel.org Cc: Xin Long Subject: [PATCH net-next] ip_gre: check packet length and mtu correctly in erspan_fb_xmit Date: Wed, 4 Oct 2017 17:14:05 -0700 Message-Id: <1507162445-18540-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 Similarly to early patch for erspan_xmit(), the ARPHDR_ETHER device is the length of the whole ether packet. So skb->len should subtract the dev->hard_header_len. Fixes: 1a66a836da63 ("gre: add collect_md mode to ERSPAN tunnel") Signed-off-by: William Tu Cc: Xin Long --- net/ipv4/ip_gre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index b279c325c7f6..10b21fe5b3a6 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -579,7 +579,7 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev, if (gre_handle_offloads(skb, false)) goto err_free_rt; - if (skb->len > dev->mtu) { + if (skb->len - dev->hard_header_len > dev->mtu) { pskb_trim(skb, dev->mtu); truncate = true; }