Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3487235pxk; Mon, 5 Oct 2020 10:54:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfeK5og7DV02t69J1Bh7+vy7UrbiXbkSu78IIvS+YdRu8Bn6sXbXOLzRMVaqtq+WrK0KwI X-Received: by 2002:a50:ec12:: with SMTP id g18mr813143edr.309.1601920442931; Mon, 05 Oct 2020 10:54:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601920442; cv=none; d=google.com; s=arc-20160816; b=DBCb1o/tVZ/6gjzUtQC/n0RcxKouvljmNPQvbBy93m69Kcwp///gaMoOU8ZCax4j8e L1cvUf0+5yqAOprG7wwm2v7f2IxCEg3U5vsrCF0IBup9dhc7VLpnglrlDbmZPdtJVbg4 68xgq+DOsyQh/lpDCfdyaqC0Oj+/2PDM6kIivAZQNdK6mHs+TrZDIf6ElqsNO0uA6L1A 6baX+1yAOFDT3H7XUg+NjlyFM9B/zDLqYafgrtpFl2bWEdUxufuNlGeFDF2wx/4KDLWt yB3DmQqzhgznIRuI/LEKkJMTa1ACCydnfN6MJCDadR3Eu4PNKwIGmoEFo56sOiqRI21Z tifg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GYa/MbZDvSyj1kbAeqCDgTrkB5wIql/ROu8LXHiXzTk=; b=N+pEs6ixlRRGX6HnUhwlIbBDM5Y3diZTCJ4ksxLLbDl0eoiKOUSb05sp9Y+81g67gm lJpxfN9nnKIUj9yDcGZcJ+u0xH58MqZyrKZZyM0Q/iqFDMaLESqx4UavY0c/6inSjGby 0dC/I1tlfpu1tzXn32WD83fohkZOYuGj2/zERJRkuYQKr6skwvAwZL5wKJotDVhn/B6i ZpTCp2+gFvnSfrfub+lTzUqA3bEmFgsuSmwzmGveExAqNXlTsB66VFSJoGV5nZV4+T1l qgh4rjD9HaMIOZLQ7y+WVpkhRDs+qux89xD+whxi07PGqbhOct6LD9B7Ub2ee8ZmVVIJ MYlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=goruPoUZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w11si206978ejy.632.2020.10.05.10.53.40; Mon, 05 Oct 2020 10:54:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=goruPoUZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728491AbgJEPkZ (ORCPT + 99 others); Mon, 5 Oct 2020 11:40:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:54834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbgJEP3L (ORCPT ); Mon, 5 Oct 2020 11:29:11 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 423CD2177B; Mon, 5 Oct 2020 15:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911749; bh=+PBWJoGEZS5W+f3bouiqdzAFX0EqQqm6yTb9tDVhL+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=goruPoUZiN31Ue8Qd2GBrs4Hlv0By8I0manOu8KTTFNszgy0zYCKLNTLdlbzJmgYv aXnfsvT0q5vj/stcBN7pE5RUX8PONAQG5DBdKwX10RnKJEohlaj0hloSI5+stcTnrX 5YL+CwjHIYJU8ca8KRPzao3gRRNxEP22gci1+IvI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Schiller , Xie He , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 24/57] drivers/net/wan/lapbether: Make skb->protocol consistent with the header Date: Mon, 5 Oct 2020 17:26:36 +0200 Message-Id: <20201005142110.964158295@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142109.796046410@linuxfoundation.org> References: <20201005142109.796046410@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xie He [ Upstream commit 83f9a9c8c1edc222846dc1bde6e3479703e8e5a3 ] This driver is a virtual driver stacked on top of Ethernet interfaces. When this driver transmits data on the Ethernet device, the skb->protocol setting is inconsistent with the Ethernet header prepended to the skb. This causes a user listening on the Ethernet interface with an AF_PACKET socket, to see different sll_protocol values for incoming and outgoing frames, because incoming frames would have this value set by parsing the Ethernet header. This patch changes the skb->protocol value for outgoing Ethernet frames, making it consistent with the Ethernet header prepended. This makes a user listening on the Ethernet device with an AF_PACKET socket, to see the same sll_protocol value for incoming and outgoing frames. Cc: Martin Schiller Signed-off-by: Xie He Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/wan/lapbether.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 2cff914aada55..709e3de0f6af1 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -198,8 +198,6 @@ static void lapbeth_data_transmit(struct net_device *ndev, struct sk_buff *skb) struct net_device *dev; int size = skb->len; - skb->protocol = htons(ETH_P_X25); - ptr = skb_push(skb, 2); *ptr++ = size % 256; @@ -210,6 +208,8 @@ static void lapbeth_data_transmit(struct net_device *ndev, struct sk_buff *skb) skb->dev = dev = lapbeth->ethdev; + skb->protocol = htons(ETH_P_DEC); + skb_reset_network_header(skb); dev_hard_header(skb, dev, ETH_P_DEC, bcast_addr, NULL, 0); -- 2.25.1