shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "net: check if protocol extracted by virtio_net_hdr_set_proto is correct"

Browse Source 
This reverts commit 54ef8243c3 which is
commit 924a9bc362 upstream.

This breaks the ABI and is not needed in the android-4.19-stable branch
as the issue it was added for is not relevant here.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0a0453de60f4a614448cc62736eb32681277a6e8
This commit is contained in:
Greg Kroah-Hartman
2021-03-18 10:53:05 +01:00
parent 04fd6558af
commit 748b062052
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/virtio_net.h
View File

@@ -79,13 +79,8 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
if (gso_type && skb->network_header) {
struct flow_keys_basic keys;
if (!skb->protocol) {
__be16 protocol = dev_parse_header_protocol(skb);
if (!skb->protocol)
virtio_net_hdr_set_proto(skb, hdr);
if (protocol && protocol != skb->protocol)
return -EINVAL;
}
retry:
if (!skb_flow_dissect_flow_keys_basic(skb, &keys,
NULL, 0, 0, 0,