Merge tag 'soc-arm-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[tomoyo/tomoyo-test1.git] / net / dccp / ipv4.c

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index a545ad7..8f56e87 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -247,7 +247,6 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info)
        const u8 offset = iph->ihl << 2;
        const struct dccp_hdr *dh;
        struct dccp_sock *dp;
-       struct inet_sock *inet;
        const int type = icmp_hdr(skb)->type;
        const int code = icmp_hdr(skb)->code;
        struct sock *sk;
@@ -255,12 +254,17 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info)
        int err;
        struct net *net = dev_net(skb->dev);
 
-       /* Only need dccph_dport & dccph_sport which are the first
-        * 4 bytes in dccp header.
+       /* For the first __dccp_basic_hdr_len() check, we only need dh->dccph_x,
+        * which is in byte 7 of the dccp header.
         * Our caller (icmp_socket_deliver()) already pulled 8 bytes for us.
+        *
+        * Later on, we want to access the sequence number fields, which are
+        * beyond 8 bytes, so we have to pskb_may_pull() ourselves.
         */
-       BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8);
-       BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
+       dh = (struct dccp_hdr *)(skb->data + offset);
+       if (!pskb_may_pull(skb, offset + __dccp_basic_hdr_len(dh)))
+               return -EINVAL;
+       iph = (struct iphdr *)skb->data;
        dh = (struct dccp_hdr *)(skb->data + offset);
 
        sk = __inet_lookup_established(net, &dccp_hashinfo,
@@ -361,8 +365,7 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info)
         *                                                      --ANK (980905)
         */
 
-       inet = inet_sk(sk);
-       if (!sock_owned_by_user(sk) && inet->recverr) {
+       if (!sock_owned_by_user(sk) && inet_test_bit(RECVERR, sk)) {
                sk->sk_err = err;
                sk_error_report(sk);
        } else { /* Only an error on timeout */
@@ -474,7 +477,8 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk,
                .flowi4_oif = inet_iif(skb),
                .daddr = iph->saddr,
                .saddr = iph->daddr,
-               .flowi4_tos = RT_CONN_FLAGS(sk),
+               .flowi4_tos = ip_sock_rt_tos(sk),
+               .flowi4_scope = ip_sock_rt_scope(sk),
                .flowi4_proto = sk->sk_protocol,
                .fl4_sport = dccp_hdr(skb)->dccph_dport,
                .fl4_dport = dccp_hdr(skb)->dccph_sport,