ipv6: udp: make short packet logging consistent with ipv4 (d6bc0149) · Commits · 戴 / test

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>

net/ipv6/udp.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message