Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca2c405a authored by Heiko Carstens's avatar Heiko Carstens
Browse files

kexec/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types 



In order to allow the COMPAT_SYSCALL_DEFINE macro generate code that
performs proper zero and sign extension convert all 64 bit parameters
to their corresponding 32 bit compat counterparts.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 3a49a0f7

include/linux/compat.h

+3 −3
Original line number Diff line number Diff line
@@ -641,10 +641,10 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val, 
		u32 val3);

asmlinkage long compat_sys_getsockopt(int fd, int level, int optname,

				      char __user *optval, int __user *optlen);

asmlinkage long compat_sys_kexec_load(unsigned long entry,

				      unsigned long nr_segments,

asmlinkage long compat_sys_kexec_load(compat_ulong_t entry,

				      compat_ulong_t nr_segments,

				      struct compat_kexec_segment __user *,

				      unsigned long flags);

				      compat_ulong_t flags);

asmlinkage long compat_sys_mq_getsetattr(mqd_t mqdes,

			const struct compat_mq_attr __user *u_mqstat,

			struct compat_mq_attr __user *u_omqstat);

include/linux/kexec.h

+0 −6
Original line number Diff line number Diff line
@@ -127,12 +127,6 @@ extern asmlinkage long sys_kexec_load(unsigned long entry, 
					struct kexec_segment __user *segments,

					unsigned long flags);

extern int kernel_kexec(void);

#ifdef CONFIG_COMPAT

extern asmlinkage long compat_sys_kexec_load(unsigned long entry,

				unsigned long nr_segments,

				struct compat_kexec_segment __user *segments,

				unsigned long flags);

#endif

extern struct page *kimage_alloc_control_pages(struct kimage *image,

						unsigned int order);

extern void crash_kexec(struct pt_regs *);

kernel/kexec.c

+4 −4
Original line number Diff line number Diff line
@@ -1039,10 +1039,10 @@ void __weak crash_unmap_reserved_pages(void) 
{}



#ifdef CONFIG_COMPAT

asmlinkage long compat_sys_kexec_load(unsigned long entry,

				unsigned long nr_segments,

				struct compat_kexec_segment __user *segments,

				unsigned long flags)

COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,

		       compat_ulong_t, nr_segments,

		       struct compat_kexec_segment __user *, segments,

		       compat_ulong_t, flags)

{

	struct compat_kexec_segment in;

	struct kexec_segment out, __user *ksegments;