From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Sep 2017 18:18:17 +0000 (-0700)
Subject: Merge branch 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~10549
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c51e67b64d169419fb13318035bb442f9176612;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'x86-syscall-for-linus' of git://git./linux/kernel/git/tip/tip

Pull syscall updates from Ingo Molnar:
 "Improve the security of set_fs(): we now check the address limit on a
  number of key platforms (x86, arm, arm64) before returning to
  user-space - without adding overhead to the typical system call fast
  path"

* 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arm64/syscalls: Check address limit on user-mode return
  arm/syscalls: Check address limit on user-mode return
  x86/syscalls: Check address limit on user-mode return
---

6c51e67b64d169419fb13318035bb442f9176612
diff --cc arch/arm64/kernel/signal.c
index 089c3747,0f02791..e3e3293
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@@ -23,12 -22,10 +23,13 @@@
  #include <linux/signal.h>
  #include <linux/personality.h>
  #include <linux/freezer.h>
 +#include <linux/stddef.h>
  #include <linux/uaccess.h>
 +#include <linux/sizes.h>
 +#include <linux/string.h>
  #include <linux/tracehook.h>
  #include <linux/ratelimit.h>
+ #include <linux/syscalls.h>
  
  #include <asm/debug-monitors.h>
  #include <asm/elf.h>