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

Commit 65f5d80b authored by Richard Cochran's avatar Richard Cochran Committed by Thomas Gleixner
Browse files

time: Splitout compat timex accessors 



Split out the compat timex accessors into separate
functions. Preparatory patch for a new syscall.

[ tglx: Split that patch from Richards "posix-timers: Introduce a
  	syscall for clock tuning.". Keeps the changes strictly
  	separate ]

Originally-from: Richard Cochran <richardcochran@gmail.com>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
LKML-Reference: <20110201134419.772343089@linutronix.de>
parent 094aa188

kernel/compat.c

+65 −48
Original line number Diff line number Diff line
@@ -52,6 +52,64 @@ static int compat_put_timeval(struct compat_timeval __user *o, 
		put_user(i->tv_usec, &o->tv_usec)) ? -EFAULT : 0;

}



static int compat_get_timex(struct timex *txc, struct compat_timex __user *utp)

{

	memset(txc, 0, sizeof(struct timex));



	if (!access_ok(VERIFY_READ, utp, sizeof(struct compat_timex)) ||

			__get_user(txc->modes, &utp->modes) ||

			__get_user(txc->offset, &utp->offset) ||

			__get_user(txc->freq, &utp->freq) ||

			__get_user(txc->maxerror, &utp->maxerror) ||

			__get_user(txc->esterror, &utp->esterror) ||

			__get_user(txc->status, &utp->status) ||

			__get_user(txc->constant, &utp->constant) ||

			__get_user(txc->precision, &utp->precision) ||

			__get_user(txc->tolerance, &utp->tolerance) ||

			__get_user(txc->time.tv_sec, &utp->time.tv_sec) ||

			__get_user(txc->time.tv_usec, &utp->time.tv_usec) ||

			__get_user(txc->tick, &utp->tick) ||

			__get_user(txc->ppsfreq, &utp->ppsfreq) ||

			__get_user(txc->jitter, &utp->jitter) ||

			__get_user(txc->shift, &utp->shift) ||

			__get_user(txc->stabil, &utp->stabil) ||

			__get_user(txc->jitcnt, &utp->jitcnt) ||

			__get_user(txc->calcnt, &utp->calcnt) ||

			__get_user(txc->errcnt, &utp->errcnt) ||

			__get_user(txc->stbcnt, &utp->stbcnt))

		return -EFAULT;



	return 0;

}



static int compat_put_timex(struct compat_timex __user *utp, struct timex *txc)

{

	if (!access_ok(VERIFY_WRITE, utp, sizeof(struct compat_timex)) ||

			__put_user(txc->modes, &utp->modes) ||

			__put_user(txc->offset, &utp->offset) ||

			__put_user(txc->freq, &utp->freq) ||

			__put_user(txc->maxerror, &utp->maxerror) ||

			__put_user(txc->esterror, &utp->esterror) ||

			__put_user(txc->status, &utp->status) ||

			__put_user(txc->constant, &utp->constant) ||

			__put_user(txc->precision, &utp->precision) ||

			__put_user(txc->tolerance, &utp->tolerance) ||

			__put_user(txc->time.tv_sec, &utp->time.tv_sec) ||

			__put_user(txc->time.tv_usec, &utp->time.tv_usec) ||

			__put_user(txc->tick, &utp->tick) ||

			__put_user(txc->ppsfreq, &utp->ppsfreq) ||

			__put_user(txc->jitter, &utp->jitter) ||

			__put_user(txc->shift, &utp->shift) ||

			__put_user(txc->stabil, &utp->stabil) ||

			__put_user(txc->jitcnt, &utp->jitcnt) ||

			__put_user(txc->calcnt, &utp->calcnt) ||

			__put_user(txc->errcnt, &utp->errcnt) ||

			__put_user(txc->stbcnt, &utp->stbcnt) ||

			__put_user(txc->tai, &utp->tai))

		return -EFAULT;

	return 0;

}



asmlinkage long compat_sys_gettimeofday(struct compat_timeval __user *tv,

		struct timezone __user *tz)

{
@@ -951,58 +1009,17 @@ asmlinkage long compat_sys_rt_sigsuspend(compat_sigset_t __user *unewset, compat 
asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp)

{

	struct timex txc;

	int ret;

	int err, ret;



	memset(&txc, 0, sizeof(struct timex));



	if (!access_ok(VERIFY_READ, utp, sizeof(struct compat_timex)) ||

			__get_user(txc.modes, &utp->modes) ||

			__get_user(txc.offset, &utp->offset) ||

			__get_user(txc.freq, &utp->freq) ||

			__get_user(txc.maxerror, &utp->maxerror) ||

			__get_user(txc.esterror, &utp->esterror) ||

			__get_user(txc.status, &utp->status) ||

			__get_user(txc.constant, &utp->constant) ||

			__get_user(txc.precision, &utp->precision) ||

			__get_user(txc.tolerance, &utp->tolerance) ||

			__get_user(txc.time.tv_sec, &utp->time.tv_sec) ||

			__get_user(txc.time.tv_usec, &utp->time.tv_usec) ||

			__get_user(txc.tick, &utp->tick) ||

			__get_user(txc.ppsfreq, &utp->ppsfreq) ||

			__get_user(txc.jitter, &utp->jitter) ||

			__get_user(txc.shift, &utp->shift) ||

			__get_user(txc.stabil, &utp->stabil) ||

			__get_user(txc.jitcnt, &utp->jitcnt) ||

			__get_user(txc.calcnt, &utp->calcnt) ||

			__get_user(txc.errcnt, &utp->errcnt) ||

			__get_user(txc.stbcnt, &utp->stbcnt))

		return -EFAULT;

	err = compat_get_timex(&txc, utp);

	if (err)

		return err;



	ret = do_adjtimex(&txc);



	if (!access_ok(VERIFY_WRITE, utp, sizeof(struct compat_timex)) ||

			__put_user(txc.modes, &utp->modes) ||

			__put_user(txc.offset, &utp->offset) ||

			__put_user(txc.freq, &utp->freq) ||

			__put_user(txc.maxerror, &utp->maxerror) ||

			__put_user(txc.esterror, &utp->esterror) ||

			__put_user(txc.status, &utp->status) ||

			__put_user(txc.constant, &utp->constant) ||

			__put_user(txc.precision, &utp->precision) ||

			__put_user(txc.tolerance, &utp->tolerance) ||

			__put_user(txc.time.tv_sec, &utp->time.tv_sec) ||

			__put_user(txc.time.tv_usec, &utp->time.tv_usec) ||

			__put_user(txc.tick, &utp->tick) ||

			__put_user(txc.ppsfreq, &utp->ppsfreq) ||

			__put_user(txc.jitter, &utp->jitter) ||

			__put_user(txc.shift, &utp->shift) ||

			__put_user(txc.stabil, &utp->stabil) ||

			__put_user(txc.jitcnt, &utp->jitcnt) ||

			__put_user(txc.calcnt, &utp->calcnt) ||

			__put_user(txc.errcnt, &utp->errcnt) ||

			__put_user(txc.stbcnt, &utp->stbcnt) ||

			__put_user(txc.tai, &utp->tai))

		ret = -EFAULT;

	err = compat_put_timex(utp, &txc);

	if (err)

		return err;



	return ret;

}