raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

pps: Compatibility hack should be X86-specific

Browse Source 
As of [1], using PPS_FETCH on a 64-bit ARM kernel with a 32-bit userland
is broken, returning a timeout. This is because the requested 4-byte
alignment for struct pps_ktime_compat (illegal on arm64) results in the
timeout flags field being uninitialised.

Make the hack specific to X86_64 builds with CONFIG_COMPAT defined.

[1] commit c2a49fe8ee ("pps: fix padding issue with PPS_FETCH for
    ioctl_compat")

See: https://github.com/raspberrypi/linux/issues/5430
Fixes: c2a49fe8ee ("pps: fix padding issue with PPS_FETCH for ioctl_compat")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
This commit is contained in:
Phil Elwell
2023-05-22 14:22:55 +01:00
committed by Dom Cobley
parent 61b703aa1c
commit 797299e16f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pps/pps.c
View File

@@ -254,12 +254,13 @@ static long pps_cdev_ioctl(struct file *file,
static long pps_cdev_compat_ioctl(struct file *file, static long pps_cdev_compat_ioctl(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct pps_device *pps = file->private_data;
void __user *uarg = (void __user *) arg;
cmd = _IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(void *)); cmd = _IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(void *));
#ifdef CONFIG_X86_64
if (cmd == PPS_FETCH) { if (cmd == PPS_FETCH) {
struct pps_device *pps = file->private_data;
void __user *uarg = (void __user *) arg;
struct pps_fdata_compat compat; struct pps_fdata_compat compat;
struct pps_fdata fdata; struct pps_fdata fdata;
int err; int err;
@@ -296,6 +297,7 @@ static long pps_cdev_compat_ioctl(struct file *file,
return copy_to_user(uarg, &compat, return copy_to_user(uarg, &compat,
sizeof(struct pps_fdata_compat)) ? -EFAULT : 0; sizeof(struct pps_fdata_compat)) ? -EFAULT : 0;
} }
#endif
return pps_cdev_ioctl(file, cmd, arg); return pps_cdev_ioctl(file, cmd, arg);
} }