OSDN Git Service

Merge tag 'v4.4.23' into android-4.4.y
authorDmitry Shmidt <dimitrysh@google.com>
Mon, 10 Oct 2016 19:43:03 +0000 (12:43 -0700)
committerDmitry Shmidt <dimitrysh@google.com>
Mon, 10 Oct 2016 19:43:03 +0000 (12:43 -0700)
This is the 4.4.23 stable release

1  2 
kernel/cpuset.c
kernel/trace/Makefile
kernel/trace/trace.c
net/ipv4/tcp_ipv4.c
net/ipv6/ping.c
net/ipv6/tcp_ipv6.c

diff --cc kernel/cpuset.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/ping.c
@@@ -152,9 -150,16 +152,11 @@@ int ping_v6_sendmsg(struct sock *sk, st
        rt = (struct rt6_info *) dst;
  
        np = inet6_sk(sk);
-       if (!np)
-               return -EBADF;
+       if (!np) {
+               err = -EBADF;
+               goto dst_err_out;
+       }
  
 -      if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
 -              fl6.flowi6_oif = np->mcast_oif;
 -      else if (!fl6.flowi6_oif)
 -              fl6.flowi6_oif = np->ucast_oif;
 -
        pfh.icmph.type = user_icmph.icmp6_type;
        pfh.icmph.code = user_icmph.icmp6_code;
        pfh.icmph.checksum = 0;
Simple merge