From patchwork Tue Sep 11 19:04:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11332 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 2D84323EFE for ; Tue, 11 Sep 2012 19:04:59 +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 DE3783D01A3D for ; Tue, 11 Sep 2012 19:04:58 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so1468070iea.11 for ; Tue, 11 Sep 2012 12:04:58 -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=4T0k5RpLTXKN10CmMP5dLkQGBTP+Duf4N038bT7QON4=; b=Er9Q7LnWrmMvAixyGzrRUQwX9XKd5xU3U6+l9om9JmtJZIYFJX5EoIjZlmrt4+5Bps wZTTMLKFr+TXS+BvOgVR47m+rtykPDRjCGfjk2Ujk9/u5PGv9WVx0RofuPC7Y269oT5N nCOQsvi71nqAuHWypzaGwr9w4uCO6n+S5N3IxOb7DHMQlKCjqzr90RFIYcDK/zJfgAT0 8bycG54NXSjKdjesWG+kovjPWs+cRPb+Qt4xhvVAbyVckngHiFM53LrMwuWml969nWX4 OqpHtmioPr0qIsG5OJ1AgyvFDLEAc1ps2Zj5ci+qAoAUUckVqirTFvsz4at5d0oQAnxd 63Xw== Received: by 10.50.207.106 with SMTP id lv10mr18341983igc.0.1347390298668; Tue, 11 Sep 2012 12:04:58 -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 ex8csp29258igc; Tue, 11 Sep 2012 12:04:58 -0700 (PDT) Received: by 10.236.138.132 with SMTP id a4mr16794633yhj.123.1347390297817; Tue, 11 Sep 2012 12:04:57 -0700 (PDT) Received: from e7.ny.us.ibm.com (e7.ny.us.ibm.com. [32.97.182.137]) by mx.google.com with ESMTPS id k14si7239977ann.91.2012.09.11.12.04.57 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Sep 2012 12:04:57 -0700 (PDT) Received-SPF: neutral (google.com: 32.97.182.137 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=32.97.182.137; Authentication-Results: mx.google.com; spf=neutral (google.com: 32.97.182.137 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 e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 11 Sep 2012 15:04:57 -0400 Received: from d01dlp03.pok.ibm.com (9.56.250.168) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 11 Sep 2012 15:04:55 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 02127C900C4; Tue, 11 Sep 2012 15:04:29 -0400 (EDT) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8BJ4Slm148208; Tue, 11 Sep 2012 15:04:28 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8BJ4RLK016742; Tue, 11 Sep 2012 16:04:28 -0300 Received: from kernel-pok.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q8BJ4Mav015936; Tue, 11 Sep 2012 16:04:22 -0300 From: John Stultz To: stable@vger.kernel.org Cc: John Stultz , Zhouping Liu , Ingo Molnar , Prarit Bhargava , Thomas Gleixner , Linus Torvalds , Linux Kernel Subject: [PATCH 3/3] 3.4.y: time: Move ktime_t overflow checking into timespec_valid_strict Date: Tue, 11 Sep 2012 15:04:19 -0400 Message-Id: <1347390259-54838-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347390259-54838-1-git-send-email-john.stultz@linaro.org> References: <1347390259-54838-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12091119-5806-0000-0000-0000197CDCC3 X-Gm-Message-State: ALoCoQnVJnORPApKiDsfB5LTYOQAOxqXOv8vOrgWKVOe5wKSklRdmq05L2oUbGoeFgMDbWvNXNc4 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 Cc: Linux Kernel Signed-off-by: John Stultz --- include/linux/time.h | 7 +++++++ kernel/time/timekeeping.c | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/linux/time.h b/include/linux/time.h index ac31186..03dce74 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -125,6 +125,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 104d549..12843e9 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -385,7 +385,7 @@ int do_settimeofday(const struct timespec *tv) struct timespec ts_delta; unsigned long flags; - if (!timespec_valid(tv)) + if (!timespec_valid_strict(tv)) return -EINVAL; write_seqlock_irqsave(&timekeeper.lock, flags); @@ -431,7 +431,7 @@ int timekeeping_inject_offset(struct timespec *ts) timekeeping_forward_now(); tmp = timespec_add(timekeeper.xtime, *ts); - if (!timespec_valid(&tmp)) { + if (!timespec_valid_strict(&tmp)) { ret = -EINVAL; goto error; } @@ -608,7 +608,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; @@ -616,7 +616,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; @@ -667,7 +667,7 @@ static void update_sleep_time(struct timespec t) */ static void __timekeeping_inject_sleeptime(struct timespec *delta) { - if (!timespec_valid(delta)) { + if (!timespec_valid_strict(delta)) { printk(KERN_WARNING "__timekeeping_inject_sleeptime: Invalid " "sleep delta value!\n"); return;