merge compat sys_ipc instances (56e41d3c) · Commits · e / devices / android_kernel_xiaomi_markw

arch/mips/kernel/linux32.c

+0 −69

Original line number	Diff line number	Diff line
		@@ -119,75 +119,6 @@ SYSCALL_DEFINE6(32_pwrite, unsigned int, fd, const char __user *, buf,
		return sys_pwrite64(fd, buf, count, merge_64(a4, a5));
		}

		#ifdef CONFIG_SYSVIPC

		SYSCALL_DEFINE6(32_ipc, u32, call, long, first, long, second, long, third,
		unsigned long, ptr, unsigned long, fifth)
		{
		int version, err;

		version = call >> 16; /* hack for backward compatibility */
		call &= 0xffff;

		switch (call) {
		case SEMOP:
		/* struct sembuf is the same on 32 and 64bit :)) */
		err = sys_semtimedop(first, compat_ptr(ptr), second, NULL);
		break;
		case SEMTIMEDOP:
		err = compat_sys_semtimedop(first, compat_ptr(ptr), second,
		compat_ptr(fifth));
		break;
		case SEMGET:
		err = sys_semget(first, second, third);
		break;
		case SEMCTL:
		err = compat_sys_semctl(first, second, third, compat_ptr(ptr));
		break;
		case MSGSND:
		err = compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
		break;
		case MSGRCV:
		err = compat_sys_msgrcv(first, second, fifth, third,
		version, compat_ptr(ptr));
		break;
		case MSGGET:
		err = sys_msgget((key_t) first, second);
		break;
		case MSGCTL:
		err = compat_sys_msgctl(first, second, compat_ptr(ptr));
		break;
		case SHMAT:
		err = compat_sys_shmat(first, second, third, version,
		compat_ptr(ptr));
		break;
		case SHMDT:
		err = sys_shmdt(compat_ptr(ptr));
		break;
		case SHMGET:
		err = sys_shmget(first, (unsigned)second, third);
		break;
		case SHMCTL:
		err = compat_sys_shmctl(first, second, compat_ptr(ptr));
		break;
		default:
		err = -EINVAL;
		break;
		}

		return err;
		}

		#else

		SYSCALL_DEFINE6(32_ipc, u32, call, int, first, int, second, int, third,
		u32, ptr, u32, fifth)
		{
		return -ENOSYS;
		}

		#endif /* CONFIG_SYSVIPC */

		#ifdef CONFIG_MIPS32_N32
		SYSCALL_DEFINE4(n32_semctl, int, semid, int, semnum, int, cmd, u32, arg)
		{

arch/mips/kernel/scall64-o32.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ sys_call_table:
		PTR compat_sys_wait4
		PTR sys_swapoff /* 4115 */
		PTR compat_sys_sysinfo
		PTR sys_32_ipc
		PTR compat_sys_ipc
		PTR sys_fsync
		PTR sys32_sigreturn
		PTR __sys_clone /* 4120 */

arch/powerpc/kernel/sys_ppc32.c

+0 −67

Original line number	Diff line number	Diff line
		@@ -61,73 +61,6 @@ asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,
		return compat_sys_select((int)n, inp, outp, exp, compat_ptr(tvp_x));
		}

		#ifdef CONFIG_SYSVIPC
		long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t ptr,
		u32 fifth)
		{
		int version;

		version = call >> 16; /* hack for backward compatibility */
		call &= 0xffff;

		switch (call) {

		case SEMTIMEDOP:
		if (fifth)
		/* sign extend semid */
		return compat_sys_semtimedop((int)first,
		compat_ptr(ptr), second,
		compat_ptr(fifth));
		/* else fall through for normal semop() */
		case SEMOP:
		/* struct sembuf is the same on 32 and 64bit :)) */
		/* sign extend semid */
		return sys_semtimedop((int)first, compat_ptr(ptr), second,
		NULL);
		case SEMGET:
		/* sign extend key, nsems */
		return sys_semget((int)first, (int)second, third);
		case SEMCTL:
		/* sign extend semid, semnum */
		return compat_sys_semctl((int)first, (int)second, third,
		compat_ptr(ptr));

		case MSGSND:
		/* sign extend msqid */
		return compat_sys_msgsnd((int)first, (int)second, third,
		compat_ptr(ptr));
		case MSGRCV:
		/* sign extend msqid, msgtyp */
		return compat_sys_msgrcv((int)first, second, (int)fifth,
		third, version, compat_ptr(ptr));
		case MSGGET:
		/* sign extend key */
		return sys_msgget((int)first, second);
		case MSGCTL:
		/* sign extend msqid */
		return compat_sys_msgctl((int)first, second, compat_ptr(ptr));

		case SHMAT:
		/* sign extend shmid */
		return compat_sys_shmat((int)first, second, third, version,
		compat_ptr(ptr));
		case SHMDT:
		return sys_shmdt(compat_ptr(ptr));
		case SHMGET:
		/* sign extend key_t */
		return sys_shmget((int)first, second, third);
		case SHMCTL:
		/* sign extend shmid */
		return compat_sys_shmctl((int)first, second, compat_ptr(ptr));

		default:
		return -ENOSYS;
		}

		return -ENOSYS;
		}
		#endif

		unsigned long compat_sys_mmap2(unsigned long addr, size_t len,
		unsigned long prot, unsigned long flags,
		unsigned long fd, unsigned long pgoff)

arch/s390/kernel/compat_linux.c

+3 −41

Original line number	Diff line number	Diff line
		@@ -288,51 +288,13 @@ asmlinkage long sys32_getegid16(void)
		return high2lowgid(from_kgid_munged(current_user_ns(), current_egid()));
		}

		/*
		* sys32_ipc() is the de-multiplexer for the SysV IPC calls in 32bit emulation.
		*
		* This is really horribly ugly.
		*/
		#ifdef CONFIG_SYSVIPC
		asmlinkage long sys32_ipc(u32 call, int first, int second, int third, u32 ptr)
		COMPAT_SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second,
		unsigned long, third, compat_uptr_t, ptr)
		{
		if (call >> 16) /* hack for backward compatibility */
		return -EINVAL;
		switch (call) {
		case SEMTIMEDOP:
		return compat_sys_semtimedop(first, compat_ptr(ptr),
		second, compat_ptr(third));
		case SEMOP:
		/* struct sembuf is the same on 32 and 64bit :)) */
		return sys_semtimedop(first, compat_ptr(ptr),
		second, NULL);
		case SEMGET:
		return sys_semget(first, second, third);
		case SEMCTL:
		return compat_sys_semctl(first, second, third,
		compat_ptr(ptr));
		case MSGSND:
		return compat_sys_msgsnd(first, second, third,
		compat_ptr(ptr));
		case MSGRCV:
		return compat_sys_msgrcv(first, second, 0, third,
		0, compat_ptr(ptr));
		case MSGGET:
		return sys_msgget((key_t) first, second);
		case MSGCTL:
		return compat_sys_msgctl(first, second, compat_ptr(ptr));
		case SHMAT:
		return compat_sys_shmat(first, second, third,
		0, compat_ptr(ptr));
		case SHMDT:
		return sys_shmdt(compat_ptr(ptr));
		case SHMGET:
		return sys_shmget(first, (unsigned)second, third);
		case SHMCTL:
		return compat_sys_shmctl(first, second, compat_ptr(ptr));
		}

		return -ENOSYS;
		return compat_sys_ipc(call, first, second, third, ptr, third);
		}
		#endif

arch/s390/kernel/compat_linux.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ long sys32_getuid16(void);
		long sys32_geteuid16(void);
		long sys32_getgid16(void);
		long sys32_getegid16(void);
		long sys32_ipc(u32 call, int first, int second, int third, u32 ptr);
		long sys32_truncate64(const char __user * path, unsigned long high,
		unsigned long low);
		long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned long low);