From: Nick Xie <nick@khadas.com>
Date: Wed, 27 May 2020 10:05:12 +0000 (+0800)
Subject: Merge tag 'v4.9.224' into khadas-vims-4.9.y
X-Git-Tag: khadas-vims-v0.9.6-release~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fa8c9eacf56abc45cd5fd41b04ae97bbb0b4c72;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'v4.9.224' into khadas-vims-4.9.y

This is the 4.9.224 stable release
---

4fa8c9eacf56abc45cd5fd41b04ae97bbb0b4c72
diff --cc Makefile
index 12f62e8844bd,3e58c142f92f..cae3ec5b66fb
--- a/Makefile
+++ b/Makefile
@@@ -677,58 -657,8 +677,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 net/ipv6/inet6_connection_sock.c
index 10d1deb30547,b760ccec44d3..d0ccf0719d08
--- a/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/syncookies.c
index a67174e0b094,4834015b27f4..28cb584784df
--- a/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;
  	}