Revert "net/packet: fix overflow in tpacket_rcv"
This reverts commit 1c514c84e3fb68ce0cf096d02b4e7b6d58b16631.
Reason for revert: This change does not compile.
Change-Id: I434b02f3abd33007f4c660c27bbd3d2c4b1955b5
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/5040
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 466c58c..ecea8ed 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2160,8 +2160,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;
@@ -2223,10 +2222,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 &&
