udp: use sk_filter_trim_cap for udp{,6}_queue_rcv_skb
authorDaniel Borkmann <daniel@iogearbox.net>
Mon, 25 Jul 2016 16:06:12 +0000 (18:06 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Jul 2016 04:40:33 +0000 (21:40 -0700)
commitba66bbe5480a012108958a71cff88b23dce84956
tree1896547dcd8bc441534f7ce2ca3b21f4911ec920
parentdeb1f45a2f8479ffa5a791e2c024a640a08f729e
udp: use sk_filter_trim_cap for udp{,6}_queue_rcv_skb

After a612769774a3 ("udp: prevent bugcheck if filter truncates packet
too much"), there followed various other fixes for similar cases such
as f4979fcea7fd ("rose: limit sk_filter trim to payload").

Latter introduced a new helper sk_filter_trim_cap(), where we can pass
the trim limit directly to the socket filter handling. Make use of it
here as well with sizeof(struct udphdr) as lower cap limit and drop the
extra skb->len test in UDP's input path.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Willem de Bruijn <willemb@google.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/udp.c
net/ipv6/udp.c