Commit 58615242 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller

[IPV4]: Consistency and whitespace cleanup of ip_rcv()

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c656491
...@@ -361,6 +361,7 @@ static inline int ip_rcv_finish(struct sk_buff *skb) ...@@ -361,6 +361,7 @@ static inline int ip_rcv_finish(struct sk_buff *skb)
int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
{ {
struct iphdr *iph; struct iphdr *iph;
u32 len;
/* When the interface is in promisc. mode, drop all the crap /* When the interface is in promisc. mode, drop all the crap
* that it receives, do not try to analyse it. * that it receives, do not try to analyse it.
...@@ -392,7 +393,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, ...@@ -392,7 +393,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
*/ */
if (iph->ihl < 5 || iph->version != 4) if (iph->ihl < 5 || iph->version != 4)
goto inhdr_error; goto inhdr_error;
if (!pskb_may_pull(skb, iph->ihl*4)) if (!pskb_may_pull(skb, iph->ihl*4))
goto inhdr_error; goto inhdr_error;
...@@ -400,21 +401,19 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, ...@@ -400,21 +401,19 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
iph = skb->nh.iph; iph = skb->nh.iph;
if (ip_fast_csum((u8 *)iph, iph->ihl) != 0) if (ip_fast_csum((u8 *)iph, iph->ihl) != 0)
goto inhdr_error; goto inhdr_error;
{ len = ntohs(iph->tot_len);
__u32 len = ntohs(iph->tot_len); if (skb->len < len || len < (iph->ihl*4))
if (skb->len < len || len < (iph->ihl<<2)) goto inhdr_error;
goto inhdr_error;
/* Our transport medium may have padded the buffer out. Now we know it /* Our transport medium may have padded the buffer out. Now we know it
* is IP we can trim to the true length of the frame. * is IP we can trim to the true length of the frame.
* Note this now means skb->len holds ntohs(iph->tot_len). * Note this now means skb->len holds ntohs(iph->tot_len).
*/ */
if (pskb_trim_rcsum(skb, len)) { if (pskb_trim_rcsum(skb, len)) {
IP_INC_STATS_BH(IPSTATS_MIB_INDISCARDS); IP_INC_STATS_BH(IPSTATS_MIB_INDISCARDS);
goto drop; goto drop;
}
} }
return NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, dev, NULL, return NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, dev, NULL,
......
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