2020-01-09 16:16:59

by Wangshaobo (bobo)

Subject: [PATCH v2] sys_personality: Add a optional arch hook arch_check_personality() for common sys_personality()

currently arm64 use __arm64_sys_arm64_personality() as its default
syscall. But using a normal hook arch_check_personality() can reject
personality settings for special case of different archs.

Signed-off-by: Wang ShaoBo <[email protected]>
---
Changes in v2:
- Delete inline ksys_personality() definition.
- Update sys_personality() definition.
Changes in v1:
- Delete macro __arm64_sys_personality.
- Add hook arch_check_personality() and update sys_personality().
---
arch/arm64/kernel/sys.c | 7 +++----
include/linux/syscalls.h | 10 ----------
kernel/exec_domain.c | 14 +++++++++++++-
3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c
index d5ffaaab31a7..5c01816d7a77 100644
--- a/arch/arm64/kernel/sys.c
+++ b/arch/arm64/kernel/sys.c
@@ -28,12 +28,13 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
return ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
}

-SYSCALL_DEFINE1(arm64_personality, unsigned int, personality)
+int arch_check_personality(unsigned int personality)
{
if (personality(personality) == PER_LINUX32 &&
!system_supports_32bit_el0())
return -EINVAL;
- return ksys_personality(personality);
+
+ return 0;
}

asmlinkage long sys_ni_syscall(void);
@@ -46,8 +47,6 @@ asmlinkage long __arm64_sys_ni_syscall(const struct pt_regs *__unused)
/*
* Wrappers to pass the pt_regs argument.
*/
-#define __arm64_sys_personality __arm64_sys_arm64_personality
-
#undef __SYSCALL
#define __SYSCALL(nr, sym) asmlinkage long __arm64_##sym(const struct pt_regs *);
#include <asm/unistd.h>
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 2960dedcfde8..b7ead4c933d5 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1389,16 +1389,6 @@ static inline long ksys_truncate(const char __user *pathname, loff_t length)
return do_sys_truncate(pathname, length);
}

-static inline unsigned int ksys_personality(unsigned int personality)
-{
- unsigned int old = current->personality;
-
- if (personality != 0xffffffff)
- set_personality(personality);
-
- return old;
-}
-
/* for __ARCH_WANT_SYS_IPC */
long ksys_semtimedop(int semid, struct sembuf __user *tsops,
unsigned int nsops,
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c
index 33f07c5f2515..1e70b41bf348 100644
--- a/kernel/exec_domain.c
+++ b/kernel/exec_domain.c
@@ -35,9 +35,21 @@ static int __init proc_execdomains_init(void)
module_init(proc_execdomains_init);
#endif

+int __weak arch_check_personality(unsigned int personality)
+{
+ return 0;
+}
+
SYSCALL_DEFINE1(personality, unsigned int, personality)
{
- unsigned int old = current->personality;
+ int check;
+ unsigned int old;
+
+ check = arch_check_personality(personality);
+ if (check)
+ return check;
+
+ old = current->personality;

if (personality != 0xffffffff)
set_personality(personality);
--
2.20.1

2020-01-10 05:47:22

by Dominik Brodowski

Subject: Re: [PATCH v2] sys_personality: Add a optional arch hook arch_check_personality() for common sys_personality()

On Thu, Jan 09, 2020 at 09:36:34PM +0800, Wang ShaoBo wrote:
> currently arm64 use __arm64_sys_arm64_personality() as its default
> syscall. But using a normal hook arch_check_personality() can reject
> personality settings for special case of different archs.
>
> Signed-off-by: Wang ShaoBo <[email protected]>

Reviewed-by: Dominik Brodowski <[email protected]>

Thanks,
Dominik

2020-03-25 10:29:38

by Wangshaobo (bobo)

Subject: Re: [PATCH v2] sys_personality: Add a optional arch hook arch_check_personality() for common sys_personality()

ping...

this issue still exists, I am looking forward to your attention.

?? 2020/1/10 13:45, Dominik Brodowski д??:
> On Thu, Jan 09, 2020 at 09:36:34PM +0800, Wang ShaoBo wrote:
>> currently arm64 use __arm64_sys_arm64_personality() as its default
>> syscall. But using a normal hook arch_check_personality() can reject
>> personality settings for special case of different archs.
>>
>> Signed-off-by: Wang ShaoBo <[email protected]>
> Reviewed-by: Dominik Brodowski <[email protected]>
>
> Thanks,
> Dominik
> .

2020-03-27 06:07:34

by Dominik Brodowski

Subject: Re: [PATCH v2] sys_personality: Add a optional arch hook arch_check_personality() for common sys_personality()

On Wed, Mar 25, 2020 at 06:27:33PM +0800, Wangshaobo (bobo) wrote:
> ping...
>
> this issue still exists, I am looking forward to your attention.
>
> 在 2020/1/10 13:45, Dominik Brodowski 写道:
> > On Thu, Jan 09, 2020 at 09:36:34PM +0800, Wang ShaoBo wrote:
> > > currently arm64 use __arm64_sys_arm64_personality() as its default
> > > syscall. But using a normal hook arch_check_personality() can reject
> > > personality settings for special case of different archs.
> > >
> > > Signed-off-by: Wang ShaoBo <[email protected]>
> > Reviewed-by: Dominik Brodowski <[email protected]>

should probably go upstream through the arm treee?

Thanks,
Dominik