Commit f1e5cedd authored by Rusty Russell's avatar Rusty Russell Committed by Stephen Hemminger

[NETFILTER]: Delete unnecessary skb_linearize() calls in iptables_{filter,mangle}.c

parent 6db59d74
...@@ -107,10 +107,6 @@ ipt_local_out_hook(unsigned int hook, ...@@ -107,10 +107,6 @@ ipt_local_out_hook(unsigned int hook,
const struct net_device *out, const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
/* FIXME: Push down to extensions --RR */
if (skb_is_nonlinear(*pskb) && skb_linearize(*pskb, GFP_ATOMIC) != 0)
return NF_DROP;
/* root is playing with raw sockets. */ /* root is playing with raw sockets. */
if ((*pskb)->len < sizeof(struct iphdr) if ((*pskb)->len < sizeof(struct iphdr)
|| (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) { || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) {
......
...@@ -145,10 +145,6 @@ ipt_local_hook(unsigned int hook, ...@@ -145,10 +145,6 @@ ipt_local_hook(unsigned int hook,
u_int32_t saddr, daddr; u_int32_t saddr, daddr;
unsigned long nfmark; unsigned long nfmark;
/* FIXME: Push down to extensions --RR */
if (skb_is_nonlinear(*pskb) && skb_linearize(*pskb, GFP_ATOMIC) != 0)
return NF_DROP;
/* root is playing with raw sockets. */ /* root is playing with raw sockets. */
if ((*pskb)->len < sizeof(struct iphdr) if ((*pskb)->len < sizeof(struct iphdr)
|| (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) { || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment