Revert "net/packet: fix overflow in tpacket_rcv"
This reverts commit 901f5dd4e51c5637e961f4217aba5e909e7eff5b.
Reason for revert: This change does not compile.
Change-Id: I065fc405ff27e317c3e79d43dc67bf3763d432ae
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/5042
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Tested-by: Robert Kolchmeyer <rkolchmeyer@google.com>
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index cdc51ea..387589a 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2199,8 +2199,7 @@
int skb_len = skb->len;
unsigned int snaplen, res;
unsigned long status = TP_STATUS_USER;
- unsigned short macoff, hdrlen;
- unsigned int netoff;
+ unsigned short macoff, netoff, hdrlen;
struct sk_buff *copy_skb = NULL;
struct timespec ts;
__u32 ts_status;
@@ -2262,10 +2261,6 @@
}
macoff = netoff - maclen;
}
- if (netoff > USHRT_MAX) {
- atomic_inc(&po->tp_drops);
- goto drop_n_restore;
- }
if (po->tp_version <= TPACKET_V2) {
if (macoff + snaplen > po->rx_ring.frame_size) {
if (po->copy_thresh &&