Message ID | 1273153475-32363-2-git-send-email-bjorn@mork.no |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Le jeudi 06 mai 2010 à 15:44 +0200, Bjørn Mork a écrit : > 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> > --- > net/ipv6/udp.c | 11 ++++++++--- > 1 files changed, 8 insertions(+), 3 deletions(-) Acked-by: Eric Dumazet <eric.dumazet@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Thu, 06 May 2010 16:49:26 +0200 > Le jeudi 06 mai 2010 à 15:44 +0200, Bjørn Mork a écrit : >> 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> >> --- >> net/ipv6/udp.c | 11 ++++++++--- >> 1 files changed, 8 insertions(+), 3 deletions(-) > > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Applied to net-next-2.6, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 9082485..d799244 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -692,7 +692,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; @@ -770,9 +770,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);
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> --- net/ipv6/udp.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)