From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZrIfPtK0lJbGgJqSvVFfYDVFlFnkJlD7NEz+xX7LbCLiMyNOQIatRmWYByCyHAa6nZ/0hCH ARC-Seal: i=1; a=rsa-sha256; t=1526631725; cv=none; d=google.com; s=arc-20160816; b=fzbVnhEi1oeD+KPCVHXM9JhM0bd84e81cjx2ixNHYmGDzYHzY3TnP1+sxFflRmvywB pSItis2CZGfBWBVtvVXLkyWt3Z4TM7fmxLdocjyk1TqAGQqoGFk9A0RpXENOV0MuNNrm 3xfKP0VVAapgxeDmQ0aoW2hG2H5etYimtMzTrGH0tnyYh69pTgQkPuZUnsTGXkER78+v Zs0nhyzz5PZ0fy91+dcD4bQwSI0/p/SxDT9eDEa8mdkz7jhRIH4SNTh7HI1jLrDgDGld UsZ8YfZyURs4wyjYv759n3kmm19pwPaRMNMyEKEGZPULA78UrRK08J9ehxroKD1MT2Js Y1AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=qvi1Hua9HOqRHkSE8mHZYezmwEH4AC8XoXjaEpZ/Mds=; b=Pr+Q8Iaw4DCzxXNYdapY02kZ03LF25AMj1mknVyd5urZYDEzIeU5TrGiIh5MqczAra i2me5EC52Y22EdDNDBMRqfhhxzoG/HhQXK1hDhKSKWFL8VW1SDgJDqyHBuv6eEZ/gSID M3y8MQ4pUKuEXAF4aIJKGeisqMiywygQekTUTFDYxpvAw4Uzr0n24l8bsfCCRsUKwjlV UfLbnYngGLMfU8nmesYj6YPMW0uUBIedabyY/fioFCG0i1M9A5ZsFhBzM5q903z/9a7z BcmE0tTlAlNRGxO5BSmElQUnbtyC9HV0zOfhNhQPWA+8kbfrktjsnX/raWL8/3ENXVBW KPCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rejyvDzw; spf=pass (google.com: domain of srs0=xuy6=if=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=XuY6=IF=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rejyvDzw; spf=pass (google.com: domain of srs0=xuy6=if=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=XuY6=IF=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Taglang , "David S. Miller" Subject: [PATCH 4.9 06/33] net: ethernet: sun: niu set correct packet size in skb Date: Fri, 18 May 2018 10:15:45 +0200 Message-Id: <20180518081535.349241445@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518081535.096308218@linuxfoundation.org> References: <20180518081535.096308218@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1600789080586007484?= X-GMAIL-MSGID: =?utf-8?q?1600789388569167567?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rob Taglang [ Upstream commit 14224923c3600bae2ac4dcae3bf0c3d4dc2812be ] Currently, skb->len and skb->data_len are set to the page size, not the packet size. This causes the frame check sequence to not be located at the "end" of the packet resulting in ethernet frame check errors. The driver does work currently, but stricter kernel facing networking solutions like OpenVSwitch will drop these packets as invalid. These changes set the packet size correctly so that these errors no longer occur. The length does not include the frame check sequence, so that subtraction was removed. Tested on Oracle/SUN Multithreaded 10-Gigabit Ethernet Network Controller [108e:abcd] and validated in wireshark. Signed-off-by: Rob Taglang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/sun/niu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -3442,7 +3442,7 @@ static int niu_process_rx_pkt(struct nap len = (val & RCR_ENTRY_L2_LEN) >> RCR_ENTRY_L2_LEN_SHIFT; - len -= ETH_FCS_LEN; + append_size = len + ETH_HLEN + ETH_FCS_LEN; addr = (val & RCR_ENTRY_PKT_BUF_ADDR) << RCR_ENTRY_PKT_BUF_ADDR_SHIFT; @@ -3452,7 +3452,6 @@ static int niu_process_rx_pkt(struct nap RCR_ENTRY_PKTBUFSZ_SHIFT]; off = addr & ~PAGE_MASK; - append_size = rcr_size; if (num_rcr == 1) { int ptype; @@ -3465,7 +3464,7 @@ static int niu_process_rx_pkt(struct nap else skb_checksum_none_assert(skb); } else if (!(val & RCR_ENTRY_MULTI)) - append_size = len - skb->len; + append_size = append_size - skb->len; niu_rx_skb_append(skb, page, off, append_size, rcr_size); if ((page->index + rp->rbr_block_size) - rcr_size == addr) {