y2038: ipc: Enable COMPAT_32BIT_TIME
Three ipc syscalls (mq_timedsend, mq_timedreceive and and semtimedop) take a timespec argument. After we move 32-bit architectures over to useing 64-bit time_t based syscalls, we need seperate entry points for the old 32-bit based interfaces. This changes the #ifdef guards for the existing 32-bit compat syscalls to check for CONFIG_COMPAT_32BIT_TIME instead, which will then be enabled on all existing 32-bit architectures. Signed-off-by: Arnd Bergmann <arnd@arndb.de>hifive-unleashed-5.1
parent
21fc538d81
commit
b0d175781a
80
ipc/mqueue.c
80
ipc/mqueue.c
|
@ -1420,6 +1420,47 @@ COMPAT_SYSCALL_DEFINE4(mq_open, const char __user *, u_name,
|
||||||
return do_mq_open(u_name, oflag, mode, p);
|
return do_mq_open(u_name, oflag, mode, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
COMPAT_SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes,
|
||||||
|
const struct compat_sigevent __user *, u_notification)
|
||||||
|
{
|
||||||
|
struct sigevent n, *p = NULL;
|
||||||
|
if (u_notification) {
|
||||||
|
if (get_compat_sigevent(&n, u_notification))
|
||||||
|
return -EFAULT;
|
||||||
|
if (n.sigev_notify == SIGEV_THREAD)
|
||||||
|
n.sigev_value.sival_ptr = compat_ptr(n.sigev_value.sival_int);
|
||||||
|
p = &n;
|
||||||
|
}
|
||||||
|
return do_mq_notify(mqdes, p);
|
||||||
|
}
|
||||||
|
|
||||||
|
COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
|
||||||
|
const struct compat_mq_attr __user *, u_mqstat,
|
||||||
|
struct compat_mq_attr __user *, u_omqstat)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
struct mq_attr mqstat, omqstat;
|
||||||
|
struct mq_attr *new = NULL, *old = NULL;
|
||||||
|
|
||||||
|
if (u_mqstat) {
|
||||||
|
new = &mqstat;
|
||||||
|
if (get_compat_mq_attr(new, u_mqstat))
|
||||||
|
return -EFAULT;
|
||||||
|
}
|
||||||
|
if (u_omqstat)
|
||||||
|
old = &omqstat;
|
||||||
|
|
||||||
|
ret = do_mq_getsetattr(mqdes, new, old);
|
||||||
|
if (ret || !old)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
if (put_compat_mq_attr(old, u_omqstat))
|
||||||
|
return -EFAULT;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPAT_32BIT_TIME
|
||||||
static int compat_prepare_timeout(const struct compat_timespec __user *p,
|
static int compat_prepare_timeout(const struct compat_timespec __user *p,
|
||||||
struct timespec64 *ts)
|
struct timespec64 *ts)
|
||||||
{
|
{
|
||||||
|
@ -1459,45 +1500,6 @@ COMPAT_SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes,
|
||||||
}
|
}
|
||||||
return do_mq_timedreceive(mqdes, u_msg_ptr, msg_len, u_msg_prio, p);
|
return do_mq_timedreceive(mqdes, u_msg_ptr, msg_len, u_msg_prio, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
COMPAT_SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes,
|
|
||||||
const struct compat_sigevent __user *, u_notification)
|
|
||||||
{
|
|
||||||
struct sigevent n, *p = NULL;
|
|
||||||
if (u_notification) {
|
|
||||||
if (get_compat_sigevent(&n, u_notification))
|
|
||||||
return -EFAULT;
|
|
||||||
if (n.sigev_notify == SIGEV_THREAD)
|
|
||||||
n.sigev_value.sival_ptr = compat_ptr(n.sigev_value.sival_int);
|
|
||||||
p = &n;
|
|
||||||
}
|
|
||||||
return do_mq_notify(mqdes, p);
|
|
||||||
}
|
|
||||||
|
|
||||||
COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
|
|
||||||
const struct compat_mq_attr __user *, u_mqstat,
|
|
||||||
struct compat_mq_attr __user *, u_omqstat)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
struct mq_attr mqstat, omqstat;
|
|
||||||
struct mq_attr *new = NULL, *old = NULL;
|
|
||||||
|
|
||||||
if (u_mqstat) {
|
|
||||||
new = &mqstat;
|
|
||||||
if (get_compat_mq_attr(new, u_mqstat))
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
if (u_omqstat)
|
|
||||||
old = &omqstat;
|
|
||||||
|
|
||||||
ret = do_mq_getsetattr(mqdes, new, old);
|
|
||||||
if (ret || !old)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
if (put_compat_mq_attr(old, u_omqstat))
|
|
||||||
return -EFAULT;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const struct inode_operations mqueue_dir_inode_operations = {
|
static const struct inode_operations mqueue_dir_inode_operations = {
|
||||||
|
|
|
@ -70,6 +70,7 @@
|
||||||
* The worst-case behavior is nevertheless O(N^2) for N wakeups.
|
* The worst-case behavior is nevertheless O(N^2) for N wakeups.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <linux/compat.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
@ -2193,7 +2194,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
|
||||||
return ksys_semtimedop(semid, tsops, nsops, timeout);
|
return ksys_semtimedop(semid, tsops, nsops, timeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_COMPAT
|
#ifdef CONFIG_COMPAT_32BIT_TIME
|
||||||
long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
|
long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
|
||||||
unsigned int nsops,
|
unsigned int nsops,
|
||||||
const struct compat_timespec __user *timeout)
|
const struct compat_timespec __user *timeout)
|
||||||
|
|
|
@ -265,10 +265,10 @@ long ksys_shmdt(char __user *shmaddr);
|
||||||
long ksys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
|
long ksys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
|
||||||
|
|
||||||
/* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */
|
/* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */
|
||||||
#ifdef CONFIG_COMPAT
|
|
||||||
long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
|
long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
|
||||||
unsigned int nsops,
|
unsigned int nsops,
|
||||||
const struct compat_timespec __user *timeout);
|
const struct compat_timespec __user *timeout);
|
||||||
|
#ifdef CONFIG_COMPAT
|
||||||
long compat_ksys_semctl(int semid, int semnum, int cmd, int arg);
|
long compat_ksys_semctl(int semid, int semnum, int cmd, int arg);
|
||||||
long compat_ksys_msgctl(int msqid, int cmd, void __user *uptr);
|
long compat_ksys_msgctl(int msqid, int cmd, void __user *uptr);
|
||||||
long compat_ksys_msgrcv(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz,
|
long compat_ksys_msgrcv(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz,
|
||||||
|
|
Loading…
Reference in New Issue