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

Commit b73f0c8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fixes from Thomas Gleixner:
 "A set of small fixes:

   - regression fix for exynos_mct clocksource

   - trivial build fix for kona clocksource

   - functional one liner fix for the sh_tmu clocksource

   - two validation fixes to prevent (root only) data corruption in the
     kernel via settimeofday and adjtimex.  Tagged for stable"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: adjtimex: Validate the ADJ_FREQUENCY values
  time: settimeofday: Validate the values of tv from user
  clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast
  clocksource: kona: fix __iomem annotation
  clocksource: exynos_mct: Fix bitmask regression for exynos4_mct_write
parents 71a59b12 5fbaba86

drivers/clocksource/bcm_kona_timer.c

+4 −5
Original line number Diff line number Diff line
@@ -68,9 +68,8 @@ static void kona_timer_disable_and_clear(void __iomem *base) 
}



static void

kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw)

kona_timer_get_counter(void __iomem *timer_base, uint32_t *msw, uint32_t *lsw)

{

	void __iomem *base = IOMEM(timer_base);

	int loop_limit = 4;



	/*
@@ -86,9 +85,9 @@ kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw) 
	 */



	while (--loop_limit) {

		*msw = readl(base + KONA_GPTIMER_STCHI_OFFSET);

		*lsw = readl(base + KONA_GPTIMER_STCLO_OFFSET);

		if (*msw == readl(base + KONA_GPTIMER_STCHI_OFFSET))

		*msw = readl(timer_base + KONA_GPTIMER_STCHI_OFFSET);

		*lsw = readl(timer_base + KONA_GPTIMER_STCLO_OFFSET);

		if (*msw == readl(timer_base + KONA_GPTIMER_STCHI_OFFSET))

			break;

	}

	if (!loop_limit) {

drivers/clocksource/exynos_mct.c

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ static void exynos4_mct_write(unsigned int value, unsigned long offset) 
	writel_relaxed(value, reg_base + offset);



	if (likely(offset >= EXYNOS4_MCT_L_BASE(0))) {

		stat_addr = (offset & ~EXYNOS4_MCT_L_MASK) + MCT_L_WSTAT_OFFSET;

		switch (offset & EXYNOS4_MCT_L_MASK) {

		stat_addr = (offset & EXYNOS4_MCT_L_MASK) + MCT_L_WSTAT_OFFSET;

		switch (offset & ~EXYNOS4_MCT_L_MASK) {

		case MCT_L_TCON_OFFSET:

			mask = 1 << 3;		/* L_TCON write status */

			break;

drivers/clocksource/sh_tmu.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, 
	ced->features = CLOCK_EVT_FEAT_PERIODIC;

	ced->features |= CLOCK_EVT_FEAT_ONESHOT;

	ced->rating = 200;

	ced->cpumask = cpumask_of(0);

	ced->cpumask = cpu_possible_mask;

	ced->set_next_event = sh_tmu_clock_event_next;

	ced->set_mode = sh_tmu_clock_event_mode;

	ced->suspend = sh_tmu_clock_event_suspend;

include/linux/time.h

+13 −0
Original line number Diff line number Diff line
@@ -110,6 +110,19 @@ static inline bool timespec_valid_strict(const struct timespec *ts) 
	return true;

}



static inline bool timeval_valid(const struct timeval *tv)

{

	/* Dates before 1970 are bogus */

	if (tv->tv_sec < 0)

		return false;



	/* Can't have more microseconds then a second */

	if (tv->tv_usec < 0 || tv->tv_usec >= USEC_PER_SEC)

		return false;



	return true;

}



extern struct timespec timespec_trunc(struct timespec t, unsigned gran);



#define CURRENT_TIME		(current_kernel_time())

kernel/time/ntp.c

+7 −0
Original line number Diff line number Diff line
@@ -633,6 +633,13 @@ int ntp_validate_timex(struct timex *txc) 
	if ((txc->modes & ADJ_SETOFFSET) && (!capable(CAP_SYS_TIME)))

		return -EPERM;



	if (txc->modes & ADJ_FREQUENCY) {

		if (LONG_MIN / PPM_SCALE > txc->freq)

			return -EINVAL;

		if (LONG_MAX / PPM_SCALE < txc->freq)

			return -EINVAL;

	}



	return 0;

}