From patchwork Tue Sep 18 00:36:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11478 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6D4B5392CCF for ; Tue, 18 Sep 2012 00:36:31 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0C95CA181AA for ; Tue, 18 Sep 2012 00:36:30 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so10059510iea.11 for ; Mon, 17 Sep 2012 17:36:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=vxyVK6TsNGxdMmeTxXzzicBKeAv0DDhO1FbPH3nW2fc=; b=axaJVAwkutQMhlF7AevgTWsfG17rv9T8W4LhvXrqMEZmvUm9iA8CJPI8IZszf1h/Dg Emh/YnKdwzRh3a3vz8mGXDvBc5+OVZ9k8jrud8tc6FwS0WO59Sj7zmvhnfyu0Oag2ocZ KGWJLe75/px8TYo69v+tGDAd2KYpvJOJy0e4Wnq/tPetFTqqXnTfoONFnyHNKZNPHr8l r9DuYd5lRITbyNQuxroyg5DK8lib7eChNF0/e1xT6SfMyCaVpOhZMS9VfNNrQan1r8hl 8tqTgXnTsuGciKSFdz/7mDx0WhlzxefxrM522uaSiqZIRLH42+p1nxfJt61ztwyfzaY8 /xhg== Received: by 10.50.217.227 with SMTP id pb3mr8745034igc.28.1347928590622; Mon, 17 Sep 2012 17:36:30 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp345626igc; Mon, 17 Sep 2012 17:36:30 -0700 (PDT) Received: by 10.60.170.105 with SMTP id al9mr13149613oec.136.1347928590032; Mon, 17 Sep 2012 17:36:30 -0700 (PDT) Received: from e37.co.us.ibm.com (e37.co.us.ibm.com. [32.97.110.158]) by mx.google.com with ESMTPS id 10si11829186oef.26.2012.09.17.17.36.29 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 17:36:29 -0700 (PDT) Received-SPF: neutral (google.com: 32.97.110.158 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=32.97.110.158; Authentication-Results: mx.google.com; spf=neutral (google.com: 32.97.110.158 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 17 Sep 2012 18:36:29 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 17 Sep 2012 18:36:26 -0600 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 5967519D8043; Mon, 17 Sep 2012 18:36:26 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8I0aQvV268500; Mon, 17 Sep 2012 18:36:26 -0600 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8I0bvIL008588; Mon, 17 Sep 2012 18:37:57 -0600 Received: from kernel-pok.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q8I0bspF008500; Mon, 17 Sep 2012 18:37:56 -0600 From: John Stultz To: stable@vger.kernel.org Cc: John Stultz , Zhouping Liu , Ingo Molnar , Prarit Bhargava , Thomas Gleixner , Linus Torvalds Subject: [PATCH 3/3] 2.6.35.y: time: Move ktime_t overflow checking into timespec_valid_strict Date: Mon, 17 Sep 2012 20:36:20 -0400 Message-Id: <1347928580-22833-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347928580-22833-1-git-send-email-john.stultz@linaro.org> References: <1347928580-22833-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12091800-7408-0000-0000-00000895F629 X-Gm-Message-State: ALoCoQl7VlcZm0uER0DSaFEQOz7JvCwnY02NM1UjPKJLh8Z5WdWs7Ivm8TqzDyup6aJ5b3JaRYvt This is a -stable backport of cee58483cf56e0ba355fdd97ff5e8925329aa936 Andreas Bombe reported that the added ktime_t overflow checking added to timespec_valid in commit 4e8b14526ca7 ("time: Improve sanity checking of timekeeping inputs") was causing problems with X.org because it caused timeouts larger then KTIME_T to be invalid. Previously, these large timeouts would be clamped to KTIME_MAX and would never expire, which is valid. This patch splits the ktime_t overflow checking into a new timespec_valid_strict function, and converts the timekeeping codes internal checking to use this more strict function. Reported-and-tested-by: Andreas Bombe Cc: Zhouping Liu Cc: Ingo Molnar Cc: Prarit Bhargava Cc: Thomas Gleixner Cc: stable@vger.kernel.org Signed-off-by: John Stultz Signed-off-by: Linus Torvalds Signed-off-by: John Stultz --- include/linux/time.h | 7 +++++++ kernel/time/timekeeping.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/linux/time.h b/include/linux/time.h index f040fb0..593d681 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -109,6 +109,13 @@ static inline bool timespec_valid(const struct timespec *ts) /* Can't have more nanoseconds then a second */ if ((unsigned long)ts->tv_nsec >= NSEC_PER_SEC) return false; + return true; +} + +static inline bool timespec_valid_strict(const struct timespec *ts) +{ + if (!timespec_valid(ts)) + return false; /* Disallow values that could overflow ktime_t */ if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX) return false; diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index ae27d69..33afaec 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -337,7 +337,7 @@ int do_settimeofday(struct timespec *tv) struct timespec ts_delta; unsigned long flags; - if (!timespec_valid(tv)) + if (!timespec_valid_strict(tv)) return -EINVAL; write_seqlock_irqsave(&xtime_lock, flags); @@ -551,7 +551,7 @@ void __init timekeeping_init(void) struct timespec now, boot; read_persistent_clock(&now); - if (!timespec_valid(&now)) { + if (!timespec_valid_strict(&now)) { pr_warn("WARNING: Persistent clock returned invalid value!\n" " Check your CMOS/BIOS settings.\n"); now.tv_sec = 0; @@ -559,7 +559,7 @@ void __init timekeeping_init(void) } read_boot_clock(&boot); - if (!timespec_valid(&boot)) { + if (!timespec_valid_strict(&boot)) { pr_warn("WARNING: Boot clock returned invalid value!\n" " Check your CMOS/BIOS settings.\n"); boot.tv_sec = 0;