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

Commit a78ee9ed authored by Al Viro's avatar Al Viro
Browse files

shmat(2): move compat to native 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9b1404c2

ipc/compat.c

+0 −16
Original line number Diff line number Diff line
@@ -80,22 +80,6 @@ void to_compat_ipc_perm(struct compat_ipc_perm *to, struct ipc64_perm *from) 
	to->seq = from->seq;

}



#ifndef COMPAT_SHMLBA

#define COMPAT_SHMLBA	SHMLBA

#endif



COMPAT_SYSCALL_DEFINE3(shmat, int, shmid, compat_uptr_t, shmaddr, int, shmflg)

{

	unsigned long ret;

	long err;



	err = do_shmat(shmid, compat_ptr(shmaddr), shmflg, &ret, COMPAT_SHMLBA);

	if (err)

		return err;

	force_successful_syscall_return();

	return (long)ret;

}



COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,

		       unsigned, nsops,

		       const struct compat_timespec __user *, timeout)

ipc/shm.c

+19 −0
Original line number Diff line number Diff line
@@ -1439,6 +1439,25 @@ SYSCALL_DEFINE3(shmat, int, shmid, char __user *, shmaddr, int, shmflg) 
	return (long)ret;

}



#ifdef CONFIG_COMPAT



#ifndef COMPAT_SHMLBA

#define COMPAT_SHMLBA	SHMLBA

#endif



COMPAT_SYSCALL_DEFINE3(shmat, int, shmid, compat_uptr_t, shmaddr, int, shmflg)

{

	unsigned long ret;

	long err;



	err = do_shmat(shmid, compat_ptr(shmaddr), shmflg, &ret, COMPAT_SHMLBA);

	if (err)

		return err;

	force_successful_syscall_return();

	return (long)ret;

}

#endif



/*

 * detach and kill segment if marked destroyed.

 * The work is done in shm_close.