From patchwork Tue Sep 18 01:38:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11483 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 9DEA324183 for ; Tue, 18 Sep 2012 01:38:57 +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 1276BA18D12 for ; Tue, 18 Sep 2012 01:38:56 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so10130412iea.11 for ; Mon, 17 Sep 2012 18:38:56 -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-cbid :x-gm-message-state; bh=yYDVTHC4joSKob5F2rAQG/NhAPKt5VWKG573Z6VMeIE=; b=Ucbzj5EWZjuMUU3J5TVrYiJrzpXsSGhNqKhKHAQnx9OW/SZp7zoj1+edQPCJGbK8Iw xRe+8Hd1VD4V0+HuZQk1pjpvGowjYpOkD7tHibqcVVCw+WX/3+Z1E8cWJ1gKLPkaLRDV Aj3PXpPCBjwQ5U7nV5fLsl08hPqDrunP7MUIuRj/AgSGj0l7o8BTeGmUNqXwduSnItsN O7XEMQd495PKUc5ex8OgLSPeCJBcnKlUScJwIQXNFCKD7chn+lndzUys6xE4aePyDSQ4 32mBehlwSyM1KR/2A64UTJ7utxGrhqpwq6GbK2bi/8oir7H881wxjrpbWDesYb5D+XEz 3VcA== Received: by 10.50.195.134 with SMTP id ie6mr8858383igc.28.1347932336823; Mon, 17 Sep 2012 18:38:56 -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 ex8csp348180igc; Mon, 17 Sep 2012 18:38:55 -0700 (PDT) Received: by 10.60.29.165 with SMTP id l5mr13854659oeh.105.1347932335455; Mon, 17 Sep 2012 18:38:55 -0700 (PDT) Received: from e6.ny.us.ibm.com (e6.ny.us.ibm.com. [32.97.182.146]) by mx.google.com with ESMTPS id 10si11922486oef.26.2012.09.17.18.38.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 18:38:55 -0700 (PDT) Received-SPF: neutral (google.com: 32.97.182.146 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=32.97.182.146; Authentication-Results: mx.google.com; spf=neutral (google.com: 32.97.182.146 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 e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 17 Sep 2012 21:38:54 -0400 Received: from d01relay03.pok.ibm.com (9.56.227.235) by e6.ny.us.ibm.com (192.168.1.106) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 17 Sep 2012 21:38:52 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8I1cpe7100962; Mon, 17 Sep 2012 21:38:51 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8I1corF029976; Mon, 17 Sep 2012 21:38:51 -0400 Received: from kernel-pok.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q8I1co9X029955; Mon, 17 Sep 2012 21:38:50 -0400 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] 2.6.34.y: time: Move ktime_t overflow checking into timespec_valid_strict Date: Mon, 17 Sep 2012 21:38:47 -0400 Message-Id: <1347932327-33192-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347932327-33192-1-git-send-email-john.stultz@linaro.org> References: <1347932327-33192-1-git-send-email-john.stultz@linaro.org> x-cbid: 12091801-1976-0000-0000-00001176B09E X-Gm-Message-State: ALoCoQk8a2r+WFGbT4rBXRxaFVicxGqkPVX5piYViPqkWoQ2AyEe089OiQLzQah2fdyN0MIIe8it 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 | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/linux/time.h b/include/linux/time.h index 146b6f3..bc93987 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 bbdad71a..21cd75b 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -343,7 +343,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); @@ -559,7 +559,7 @@ void __init timekeeping_init(void) struct timespec now, boot; read_persistent_clock(&now); - if (!timespec_valid(&now)) { + if (!timespec_valid_strict(&now)) { printk("WARNING: Persistent clock returned invalid value!\n" " Check your CMOS/BIOS settings.\n"); now.tv_sec = 0; @@ -567,7 +567,7 @@ void __init timekeeping_init(void) } read_boot_clock(&boot); - if (!timespec_valid(&boot)) { + if (!timespec_valid_strict(&boot)) { printk("WARNING: Boot clock returned invalid value!\n" " Check your CMOS/BIOS settings.\n"); boot.tv_sec = 0;