Use general protocol header length in protocol filter.

logwang · logwang · commit f17ba62bb678 · 2017-11-21T11:20:14.000+08:00
diff --git a/lib/ff_dpdk_if.c b/lib/ff_dpdk_if.c
@@ -878,7 +878,7 @@ ff_veth_input(const struct ff_dpdk_if_context *ctx, struct rte_mbuf *pkt)
 static enum FilterReturn
 protocol_filter(const void *data, uint16_t len)
 {
-    if(len < sizeof(struct ether_hdr))
+    if(len < ETHER_HDR_LEN)
         return FILTER_UNKNOWN;
 
     const struct ether_hdr *hdr;
diff --git a/lib/ff_dpdk_kni.c b/lib/ff_dpdk_kni.c
@@ -258,6 +258,9 @@ protocol_filter_ip(const void *data, uint16_t len)
     hdr = (const struct ipv4_hdr *)data;
 
     int hdr_len = (hdr->version_ihl & 0x0f) << 2;
+    if (len < hdr_len)
+        return FILTER_UNKNOWN;
+
     void *next = (void *)data + hdr_len;
     uint16_t next_len = len - hdr_len;
 

Original file line number	Diff line number	Diff line change
`@@ -878,7 +878,7 @@ ff_veth_input(const struct ff_dpdk_if_context ctx, struct rte_mbuf pkt)`
`878`	`878`	`static enum FilterReturn`
`879`	`879`	`protocol_filter(const void *data, uint16_t len)`
`880`	`880`	`{`
`881`		`- if(len < sizeof(struct ether_hdr))`
	`881`	`+ if(len < ETHER_HDR_LEN)`
`882`	`882`	`return FILTER_UNKNOWN;`
`883`	`883`
`884`	`884`	`const struct ether_hdr *hdr;`