From patchwork Mon Oct 27 05:46:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 39555 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4E5BD24026 for ; Mon, 27 Oct 2014 05:49:39 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf318680eek.7 for ; Sun, 26 Oct 2014 22:49:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ssoLhj9OVyo0iAC0DNItmFVoJ4iFitWNb9Wey7V1lmE=; b=kW+ZT+XmwCvin2WZ+XNKvAOI+C4HCbYp/V3ZtuNP5r4T0N30Xu5HO5D8OQmOZ5l+QA hGmI56CHW7S3SzhPy8T+zpguAZkMpx+gDoqtPfax3HONF/c2smrxA7ssjODThQSYjQJk rmXxCyY3YkA5VPJ0l5VmBcwdWuudR2xPxI/6m4guvFYS8Shncp9I+uu5B7eSWwQO0FRJ l4Sc9Is/FhahjESdVpS0fCjWVfHwarGAgF4nnIRzs3Fh5jIqGLB0LXCHgsLOgsjSy+0/ UYH7lWvC8kfzcy5BMpOJ6J/HLyewzyIH8OBibu7vOKOgAeEUwR0WBgaqE62CN7UCLeYj KXVw== X-Gm-Message-State: ALoCoQlfdNk4pCKLaMfy1DZrVKRPv3m/C6IJU1JNBbaJbd6XGJqxS9z/3Y9AHHmI0XfZ7qG7q+sk X-Received: by 10.112.147.131 with SMTP id tk3mr5141306lbb.2.1414388978413; Sun, 26 Oct 2014 22:49:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.71 with SMTP id k7ls565555lam.90.gmail; Sun, 26 Oct 2014 22:49:38 -0700 (PDT) X-Received: by 10.152.20.199 with SMTP id p7mr21102985lae.49.1414388978238; Sun, 26 Oct 2014 22:49:38 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id y3si8841536lbf.66.2014.10.26.22.49.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:49:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id ge10so4486lab.8 for ; Sun, 26 Oct 2014 22:49:38 -0700 (PDT) X-Received: by 10.112.12.35 with SMTP id v3mr20952250lbb.80.1414388978018; Sun, 26 Oct 2014 22:49:38 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp235827lbz; Sun, 26 Oct 2014 22:49:37 -0700 (PDT) X-Received: by 10.70.96.162 with SMTP id dt2mr21958863pdb.29.1414388976438; Sun, 26 Oct 2014 22:49:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dk3si9702457pbd.43.2014.10.26.22.49.35 for ; Sun, 26 Oct 2014 22:49:36 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751495AbaJ0Ftd (ORCPT + 26 others); Mon, 27 Oct 2014 01:49:33 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:63787 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752027AbaJ0FrS (ORCPT ); Mon, 27 Oct 2014 01:47:18 -0400 Received: by mail-pa0-f42.google.com with SMTP id bj1so1205851pad.29 for ; Sun, 26 Oct 2014 22:47:18 -0700 (PDT) X-Received: by 10.68.134.230 with SMTP id pn6mr21905119pbb.88.1414388838564; Sun, 26 Oct 2014 22:47:18 -0700 (PDT) Received: from wangdeqiang.com ([210.21.227.66]) by mx.google.com with ESMTPSA id jq5sm9723922pbc.32.2014.10.26.22.47.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:47:18 -0700 (PDT) From: "pang.xunlei" To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: John Stultz , Thomas Gleixner , Alessandro Zummo , "pang.xunlei" Subject: [PATCH RFC 04/12] time: Add rtc_tm_to_time() safe version(using time64_t) Date: Mon, 27 Oct 2014 13:46:34 +0800 Message-Id: <1414388802-5866-3-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414388802-5866-1-git-send-email-pang.xunlei@linaro.org> References: <1414388802-5866-1-git-send-email-pang.xunlei@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pang.xunlei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The kernel uses 32-bit signed value(time_t) for seconds since 1970-01-01:00:00:00, thus it will overflow at 2038-01-19 03:14:08 on 32-bit systems. We call this "2038 safety" issue. As part of addressing 2038 saftey for in-kernel uses, this patch adds the safe rtc_tm_to_time() using time64_t. After this patch, rtc_tm_to_time_unsafe() should be replaced by rtc_tm_to_time() one by one. Eventually, rtc_tm_to_time_unsafe() will be removed from the kernel when it has no users. Signed-off-by: pang.xunlei --- drivers/rtc/rtc-lib.c | 9 +++++++++ include/linux/rtc.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c index 168d2a2..829eef8 100644 --- a/drivers/rtc/rtc-lib.c +++ b/drivers/rtc/rtc-lib.c @@ -111,6 +111,15 @@ EXPORT_SYMBOL(rtc_valid_tm); /* * Convert Gregorian date to seconds since 01-01-1970 00:00:00. */ +int rtc_tm_to_time(struct rtc_time *tm, time64_t *time) +{ + *time = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); + return 0; +} +EXPORT_SYMBOL(rtc_tm_to_time); + +/* TODO: [2038 safety] unsafe for legacy, and should be replaced by rtc_tm_to_time() */ int rtc_tm_to_time_unsafe(struct rtc_time *tm, unsigned long *time) { *time = (unsigned long) mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 97bbb6f..ffd22e9 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -19,6 +19,7 @@ extern int rtc_month_days(unsigned int month, unsigned int year); extern int rtc_year_days(unsigned int day, unsigned int month, unsigned int year); extern int rtc_valid_tm(struct rtc_time *tm); +extern int rtc_tm_to_time(struct rtc_time *tm, time64_t *time); extern int rtc_tm_to_time_unsafe(struct rtc_time *tm, unsigned long *time); extern void rtc_time_to_tm(unsigned long time, struct rtc_time *tm); ktime_t rtc_tm_to_ktime(struct rtc_time tm);