Commit 621c37fa authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Wentao Guan
Browse files

ptp: Properly handle compat ioctls 

stable inclusion
from stable-v6.6.76
commit 2a6d1e1d022bf1b3dce34b7d25d3783f59006561
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBW08Q

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2a6d1e1d022bf1b3dce34b7d25d3783f59006561



--------------------------------

[ Upstream commit 19ae40f572a9ce1ade9954990af709a03fd37010 ]

Pointer arguments passed to ioctls need to pass through compat_ptr() to
work correctly on s390; as explained in Documentation/driver-api/ioctl.rst.
Detect compat mode at runtime and call compat_ptr() for those commands
which do take pointer arguments.

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/lkml/1ba5d3a4-7931-455b-a3ce-85a968a7cb10@app.fastmail.com/


Fixes: d94ba80e ("ptp: Added a brand new class driver for ptp clocks.")
Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Reviewed-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Link: https://patch.msgid.link/20250125-posix-clock-compat_ioctl-v2-1-11c865c500eb@weissschuh.net


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 2a6d1e1d022bf1b3dce34b7d25d3783f59006561)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 5de6ee7d

drivers/ptp/ptp_chardev.c

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *

 * Copyright (C) 2010 OMICRON electronics GmbH

 */

#include <linux/compat.h>

#include <linux/module.h>

#include <linux/posix-clock.h>

#include <linux/poll.h>
@@ -124,6 +125,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) 
	struct timespec64 ts;

	int enable, err = 0;



	if (in_compat_syscall() && cmd != PTP_ENABLE_PPS && cmd != PTP_ENABLE_PPS2)

		arg = (unsigned long)compat_ptr(arg);



	switch (cmd) {



	case PTP_CLOCK_GETCAPS: