From patchwork Thu Jun 9 05:04:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9166267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B099E60467 for ; Thu, 9 Jun 2016 05:10:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2C9026490 for ; Thu, 9 Jun 2016 05:10:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 974E928294; Thu, 9 Jun 2016 05:10:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B74A26490 for ; Thu, 9 Jun 2016 05:10:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1945986AbcFIFHi (ORCPT ); Thu, 9 Jun 2016 01:07:38 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:34191 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424948AbcFIFFu (ORCPT ); Thu, 9 Jun 2016 01:05:50 -0400 Received: by mail-pa0-f68.google.com with SMTP id ug1so1915510pab.1; Wed, 08 Jun 2016 22:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ym/YLUtdatuRvlPqLleNzbTj1A2k+qxafE69JatTe/o=; b=WhGoJrTgrGLjSHbU76ubggX6nTTk7U8K43G50pLryEQ81Zli0ZAj/cYTBce+0qTRZl BJ0Fh7FpHKwj3pLmQN7hcK26jmkC1Bm0z4YVBsWrxfP8q/ezCX3cmMgiz1LMvXnhXvAA s5ZUi3NKeO6+3081JGLDLRxEpQGWBkkmVaaNBYFMfKffjrg4OZwJg2rDWGHoK4hYXgAv l2R8D74bNsPfwOpGSMzyizNBXZpNqRe9HwEuBCjz9TzexnvzIolHR4VyNfRka7lsSM2c pk5Sfg4JhiPcwF7bY/J1FKVC/QoejxA4AcCktejB+T7D5DkkRf2SISc/Wn0vw9nRkeVq plXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ym/YLUtdatuRvlPqLleNzbTj1A2k+qxafE69JatTe/o=; b=JKRtjkozPP8lQrtIOHL0vEmU4f2V8xI1KOVekF5rXBBe6v00enLBGLrj+dXzIQIuCz GO8ifdpOz449n9ZZniRkppVm/PSGhon7KxUMFqiUe8gjgqEwUHKSN2H5cPqQO30SF+3e TrKWJYaZA6s131ZBh4b2kNTMK+mDOew9IAkb5IzJdE/a1VKMWHNdvwJn1+7LGtdzxKvj 1uAPGa925eKY2kfsuNrsKRlPbci6UdkXdBsttwJIMR6DY6m+CyKcJMoUz1MOm3y9Um1Q AApLCw5jH48j2JUCuVXQxbF9AyNRmpfk2wCyMeTZ83NSx26ZeWeZ21EYg5Ual8u+ze/y CPyg== X-Gm-Message-State: ALyK8tJLdP9FKrdxcGQx1M9H5OKIeTpATIqAcGgGn9nNtr508sGm0SYL9SobDb0+jFizfw== X-Received: by 10.66.148.74 with SMTP id tq10mr10091916pab.21.1465448749190; Wed, 08 Jun 2016 22:05:49 -0700 (PDT) Received: from deepa-ubuntu.hsd1.ca.comcast.net (c-73-252-251-201.hsd1.ca.comcast.net. [73.252.251.201]) by smtp.gmail.com with ESMTPSA id 129sm6220808pfe.3.2016.06.08.22.05.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jun 2016 22:05:48 -0700 (PDT) From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Al Viro , Linus Torvalds , y2038@lists.linaro.org, Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org Subject: [PATCH 08/21] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Date: Wed, 8 Jun 2016 22:04:52 -0700 Message-Id: <1465448705-25055-9-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> References: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is in preparation for the patch that transitions vfs timestamps to use 64 bit time and hence make them y2038 safe. CURRENT_TIME macro will be deleted before merging the aforementioned patch. Filesystem times will use current_fs_time() instead of CURRENT_TIME. Use ktime_get_real_ts() here as this is not filesystem time. ktime_get_real_ts() returns the timestamp in ns which can be used to calculate network time for NTLMv2 authentication timestamp. All cifs timestamps currently use timespec internally. This timestamp can also be transitioned into using timespec64 when all other timestamps for cifs is transitioned to use timespec64. Signed-off-by: Deepa Dinamani Cc: Steve French Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org --- fs/cifs/cifsencrypt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index 6aeb8d4..b86ce67 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -471,6 +471,7 @@ find_timestamp(struct cifs_ses *ses) unsigned char *blobptr; unsigned char *blobend; struct ntlmssp2_name *attrptr; + struct timespec ts; if (!ses->auth_key.len || !ses->auth_key.response) return 0; @@ -495,7 +496,8 @@ find_timestamp(struct cifs_ses *ses) blobptr += attrsize; /* advance attr value */ } - return cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME)); + ktime_get_real_ts(&ts); + return cpu_to_le64(cifs_UnixTimeToNT(ts)); } static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,