Merge tag 'v4.9.224' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

This is the 4.9.224 stable release

Change-Id: I0e07ea572bc1a980b42dea56ab1fcb1069640ac1

diff --cc Makefile
index 49b5380,3e58c14..62deac6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -676,58 -657,8 +676,55 @@@ KBUILD_CFLAGS    += $(call cc-option,-ffun
  KBUILD_CFLAGS += $(call cc-option,-fdata-sections,)
  endif
  
 +ifdef CONFIG_LTO_CLANG
 +lto-clang-flags       := -flto -fvisibility=hidden
 +
 +# allow disabling only clang LTO where needed
 +DISABLE_LTO_CLANG := -fno-lto -fvisibility=default
 +export DISABLE_LTO_CLANG
 +endif
 +
 +ifdef CONFIG_LTO
 +lto-flags     := $(lto-clang-flags)
 +KBUILD_CFLAGS += $(lto-flags)
 +
 +DISABLE_LTO   := $(DISABLE_LTO_CLANG)
 +export DISABLE_LTO
 +
 +# LDFINAL_vmlinux and LDFLAGS_FINAL_vmlinux can be set to override
 +# the linker and flags for vmlinux_link.
 +export LDFINAL_vmlinux LDFLAGS_FINAL_vmlinux
 +endif
 +
 +ifdef CONFIG_CFI_CLANG
 +cfi-clang-flags       += -fsanitize=cfi
 +DISABLE_CFI_CLANG := -fno-sanitize=cfi
 +ifdef CONFIG_MODULES
 +cfi-clang-flags       += -fsanitize-cfi-cross-dso
 +DISABLE_CFI_CLANG += -fno-sanitize-cfi-cross-dso
 +endif
 +ifdef CONFIG_CFI_PERMISSIVE
 +cfi-clang-flags       += -fsanitize-recover=cfi -fno-sanitize-trap=cfi
 +endif
 +
 +# also disable CFI when LTO is disabled
 +DISABLE_LTO_CLANG += $(DISABLE_CFI_CLANG)
 +# allow disabling only clang CFI where needed
 +export DISABLE_CFI_CLANG
 +endif
 +
 +ifdef CONFIG_CFI
 +# cfi-flags are re-tested in prepare-compiler-check
 +cfi-flags     := $(cfi-clang-flags)
 +KBUILD_CFLAGS += $(cfi-flags)
 +
 +DISABLE_CFI   := $(DISABLE_CFI_CLANG)
 +DISABLE_LTO   += $(DISABLE_CFI)
 +export DISABLE_CFI
 +endif
 +
  ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
- else
- ifdef CONFIG_PROFILE_ALL_BRANCHES
- KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
+ KBUILD_CFLAGS   += -Os
  else
  KBUILD_CFLAGS   += -O2
  endif

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/usb/gadget/configfs.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc fs/char_dev.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/net/addrconf.h
Simple merge

diff --cc include/net/netfilter/nf_conntrack.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge

diff --cc net/ipv6/datagram.c
Simple merge

diff --cc net/ipv6/inet6_connection_sock.c
index 10d1deb,b760cce..d0ccf07
--- 1/net/ipv6/inet6_connection_sock.c
--- 2/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@@ -88,10 -88,9 +88,10 @@@ struct dst_entry *inet6_csk_route_req(c
        fl6->flowi6_mark = ireq->ir_mark;
        fl6->fl6_dport = ireq->ir_rmt_port;
        fl6->fl6_sport = htons(ireq->ir_num);
 +      fl6->flowi6_uid = sk->sk_uid;
        security_req_classify_flow(req, flowi6_to_flowi(fl6));
  
-       dst = ip6_dst_lookup_flow(sk, fl6, final_p);
+       dst = ip6_dst_lookup_flow(sock_net(sk), sk, fl6, final_p);
        if (IS_ERR(dst))
                return NULL;
  

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/syncookies.c
index a67174e,4834015..28cb584
--- 1/net/ipv6/syncookies.c
--- 2/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@@ -228,10 -228,9 +228,10 @@@ struct sock *cookie_v6_check(struct soc
                fl6.flowi6_mark = ireq->ir_mark;
                fl6.fl6_dport = ireq->ir_rmt_port;
                fl6.fl6_sport = inet_sk(sk)->inet_sport;
 +              fl6.flowi6_uid = sk->sk_uid;
                security_req_classify_flow(req, flowi6_to_flowi(&fl6));
  
-               dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
+               dst = ip6_dst_lookup_flow(sock_net(sk), sk, &fl6, final_p);
                if (IS_ERR(dst))
                        goto out_free;
        }

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/l2tp/l2tp_ip6.c
Simple merge

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc sound/usb/quirks.c
Simple merge