Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194800
b: refs/heads/master
c: d6bc014
h: refs/heads/master
v: v3
  • Loading branch information
Bjørn Mork authored and David S. Miller committed May 7, 2010
1 parent c9a1249 commit 14f9a71
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 575400bf5d57f53a767bc215bd709e65e5b27a5c
refs/heads/master: d6bc0149d8f2300bffa03ea6fea3ca39744277a6
11 changes: 8 additions & 3 deletions trunk/net/ipv6/udp.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
u32 ulen = 0;

if (!pskb_may_pull(skb, sizeof(struct udphdr)))
goto short_packet;
goto discard;

saddr = &ipv6_hdr(skb)->saddr;
daddr = &ipv6_hdr(skb)->daddr;
Expand Down Expand Up @@ -781,9 +781,14 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
return 0;

short_packet:
LIMIT_NETDEBUG(KERN_DEBUG "UDP%sv6: short packet: %d/%u\n",
LIMIT_NETDEBUG(KERN_DEBUG "UDP%sv6: short packet: From [%pI6c]:%u %d/%d to [%pI6c]:%u\n",
proto == IPPROTO_UDPLITE ? "-Lite" : "",
ulen, skb->len);
saddr,
ntohs(uh->source),
ulen,
skb->len,
daddr,
ntohs(uh->dest));

discard:
UDP6_INC_STATS_BH(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);
Expand Down

0 comments on commit 14f9a71

Please sign in to comment.