diff options
| author | Bjørn Mork <bjorn@mork.no> | 2010-05-06 03:44:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-06 21:50:17 -0700 |
| commit | d6bc0149d8f2300bffa03ea6fea3ca39744277a6 (patch) | |
| tree | 5f9ecb7150071515e2b7f6557229cb7100549e53 /net/ipv6 | |
| parent | 575400bf5d57f53a767bc215bd709e65e5b27a5c (diff) | |
| download | kernel_samsung_tuna-d6bc0149d8f2300bffa03ea6fea3ca39744277a6.zip kernel_samsung_tuna-d6bc0149d8f2300bffa03ea6fea3ca39744277a6.tar.gz kernel_samsung_tuna-d6bc0149d8f2300bffa03ea6fea3ca39744277a6.tar.bz2 | |
ipv6: udp: make short packet logging consistent with ipv4
Adding addresses and ports to the short packet log message,
like ipv4/udp.c does it, makes these messages a lot more useful:
[ 822.182450] UDPv6: short packet: From [2001:db8:ffb4:3::1]:47839 23715/178 to [2001:db8:ffb4:3:5054:ff:feff:200]:1234
This requires us to drop logging in case pskb_may_pull() fails,
which also is consistent with ipv4/udp.c
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/udp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 79359c8..3d7a2c0 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -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; @@ -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); |