summaryrefslogtreecommitdiffstats
path: root/net/ipv4/udp.c
diff options
context:
space:
mode:
authorsamanthakumar <samanthakumar@google.com>2016-04-05 12:41:15 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-05 16:29:37 -0400
commite6afc8ace6dd5cef5e812f26c72579da8806f5ac (patch)
treeff84943f8c480deb208fba4b768e911f0c1090bf /net/ipv4/udp.c
parentb9bb53f3836f4eb2bdeb3447be11042bd29c2408 (diff)
downloadlinux-e6afc8ace6dd5cef5e812f26c72579da8806f5ac.tar.gz
linux-e6afc8ace6dd5cef5e812f26c72579da8806f5ac.tar.bz2
linux-e6afc8ace6dd5cef5e812f26c72579da8806f5ac.zip
udp: remove headers from UDP packets before queueing
Remove UDP transport headers before queueing packets for reception. This change simplifies a follow-up patch to add MSG_PEEK support. Signed-off-by: Sam Kumar <samanthakumar@google.com> Signed-off-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r--net/ipv4/udp.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 355bdb221057..cf747e86ce52 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1309,7 +1309,7 @@ try_again:
if (!skb)
goto out;
- ulen = skb->len - sizeof(struct udphdr);
+ ulen = skb->len;
copied = len;
if (copied > ulen)
copied = ulen;
@@ -1329,11 +1329,9 @@ try_again:
}
if (checksum_valid || skb_csum_unnecessary(skb))
- err = skb_copy_datagram_msg(skb, sizeof(struct udphdr),
- msg, copied);
+ err = skb_copy_datagram_msg(skb, 0, msg, copied);
else {
- err = skb_copy_and_csum_datagram_msg(skb, sizeof(struct udphdr),
- msg);
+ err = skb_copy_and_csum_datagram_msg(skb, 0, msg);
if (err == -EINVAL)
goto csum_copy_err;
@@ -1500,7 +1498,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
sk_incoming_cpu_update(sk);
}
- rc = sock_queue_rcv_skb(sk, skb);
+ rc = __sock_queue_rcv_skb(sk, skb);
if (rc < 0) {
int is_udplite = IS_UDPLITE(sk);
@@ -1616,10 +1614,14 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
}
}
- if (rcu_access_pointer(sk->sk_filter) &&
- udp_lib_checksum_complete(skb))
- goto csum_error;
+ if (rcu_access_pointer(sk->sk_filter)) {
+ if (udp_lib_checksum_complete(skb))
+ goto csum_error;
+ if (sk_filter(sk, skb))
+ goto drop;
+ }
+ udp_csum_pull_header(skb);
if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
is_udplite);