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

Commit fc5870f6 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Fix ioctl compat code for /dev/rtc 



RTC_IRQP_SET/RTC_EPOCH_SET don't take a pointer to an argument, but the
argument itself.  This actually simplifies the code and makes it work.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ab9b32ee

fs/compat_ioctl.c

+2 −11
Original line number Diff line number Diff line
@@ -2531,18 +2531,9 @@ static int rtc_ioctl(unsigned fd, unsigned cmd, unsigned long arg) 
		val32 = kval;

		return put_user(val32, (unsigned int __user *)arg);

	case RTC_IRQP_SET32:

		return sys_ioctl(fd, RTC_IRQP_SET, arg); 

	case RTC_EPOCH_SET32:

		ret = get_user(val32, (unsigned int __user *)arg);

		if (ret)

			return ret;

		kval = val32;



		set_fs(KERNEL_DS);

		ret = sys_ioctl(fd, (cmd == RTC_IRQP_SET32) ?

				RTC_IRQP_SET : RTC_EPOCH_SET,

				(unsigned long)&kval);

		set_fs(oldfs);

		return ret;

		return sys_ioctl(fd, RTC_EPOCH_SET, arg);

	default:

		/* unreached */

		return -ENOIOCTLCMD;