Pull timer updates from Thomas Gleixner: "The time/timekeeping/timer folks deliver with this update: - Fix a reintroduced signed/unsigned issue and cleanup the whole signed/unsigned mess in the timekeeping core so this wont happen accidentaly again. - Add a new trace clock based on boot time - Prevent injection of random sleep times when PM tracing abuses the RTC for storage - Make posix timers configurable for real tiny systems - Add tracepoints for the alarm timer subsystem so timer based suspend wakeups can be instrumented - The usual pile of fixes and updates to core and drivers" * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits) timekeeping: Use mul_u64_u32_shr() instead of open coding it timekeeping: Get rid of pointless typecasts timekeeping: Make the conversion call chain consistently unsigned timekeeping_Force_unsigned_clocksource_to_nanoseconds_conversion alarmtimer: Add tracepoints for alarm timers trace: Update documentation for mono, mono_raw and boot clock trace: Add an option for boot clock as trace clock timekeeping: Add a fast and NMI safe boot clock timekeeping/clocksource_cyc2ns: Document intended range limitation timekeeping: Ignore the bogus sleep time if pm_trace is enabled selftests/timers: Fix spelling mistake "Asyncrhonous" -> "Asynchronous" clocksource/drivers/bcm2835_timer: Unmap region obtained by of_iomap clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map() arm64: dts: rockchip: Arch counter doesn't tick in system suspend clocksource/drivers/arm_arch_timer: Don't assume clock runs in suspend posix-timers: Make them configurable posix_cpu_timers: Move the add_device_randomness() call to a proper place timer: Move sys_alarm from timer.c to itimer.c ptp_clock: Allow for it to be optional Kconfig: Regenerate *.c_shipped files after previous changes ...
Showing the changes to security (1 of 61 files). Show all
Unified · Split
| @@ -2525,7 +2525,8 @@ static void selinux_bprm_committing_creds(struct linux_binprm *bprm) · 2524 unmodified lines | ||
| 2525 | 2525 | rlim->rlim_cur = min(rlim->rlim_max, initrlim->rlim_cur); |
| 2526 | 2526 | } |
| 2527 | 2527 | task_unlock(current); |
| 2528 | − update_rlimit_cpu(current, rlimit(RLIMIT_CPU)); | |
| 2528 | + if (IS_ENABLED(CONFIG_POSIX_TIMERS)) | |
| 2529 | + update_rlimit_cpu(current, rlimit(RLIMIT_CPU)); | |
| 2529 | 2530 | } |
| 2530 | 2531 | } |
| 2531 | 2532 | |
| @@ -2555,9 +2556,11 @@ static void selinux_bprm_committed_creds(struct linux_binprm *bprm) · 23 unmodified lines | ||
| 2555 | 2556 | */ |
| 2556 | 2557 | rc = avc_has_perm(osid, sid, SECCLASS_PROCESS, PROCESS__SIGINH, NULL); |
| 2557 | 2558 | if (rc) { |
| 2558 | − memset(&itimer, 0, sizeof itimer); | |
| 2559 | − for (i = 0; i < 3; i++) | |
| 2560 | − do_setitimer(i, &itimer, NULL); | |
| 2559 | + if (IS_ENABLED(CONFIG_POSIX_TIMERS)) { | |
| 2560 | + memset(&itimer, 0, sizeof itimer); | |
| 2561 | + for (i = 0; i < 3; i++) | |
| 2562 | + do_setitimer(i, &itimer, NULL); | |
| 2563 | + } | |
| 2561 | 2564 | spin_lock_irq(¤t->sighand->siglock); |
| 2562 | 2565 | if (!fatal_signal_pending(current)) { |
| 2563 | 2566 | flush_sigqueue(¤t->pending); |