commit | 0e64123141f3854e695eb4924d82b52856691466 | [log] [tgz] |
---|---|---|
author | Olivier Deprez <olivier.deprez@arm.com> | Thu Sep 23 10:07:05 2021 +0200 |
committer | Olivier Deprez <olivier.deprez@arm.com> | Tue Oct 26 16:50:53 2021 +0100 |
tree | 9f79e140db584f9b107f4e33373a0075983df1f4 | |
parent | 98854e9675dc7d951fa9c4e10d9c9d230c54bde6 [diff] [blame] |
Update Linux to v5.4.148 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.148.tar.gz Change-Id: Ib3d26c5ba9b022e2e03533005c4fed4d7c30b61b Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index 5bd949d..ac8eee0 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c
@@ -215,14 +215,12 @@ return 0; } -int arch_copy_tls(struct task_struct *new) +int arch_set_tls(struct task_struct *new, unsigned long tls) { struct user_desc info; int idx, ret = -EFAULT; - if (copy_from_user(&info, - (void __user *) UPT_SI(&new->thread.regs.regs), - sizeof(info))) + if (copy_from_user(&info, (void __user *) tls, sizeof(info))) goto out; ret = -EINVAL;