From patchwork Sat Aug 13 22:48:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9278689 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 1806160780 for ; Sun, 14 Aug 2016 10:21:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 080B728996 for ; Sun, 14 Aug 2016 10:21:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB586289AD; Sun, 14 Aug 2016 10:21:54 +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 6988228996 for ; Sun, 14 Aug 2016 10:21:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752374AbcHNKVj (ORCPT ); Sun, 14 Aug 2016 06:21:39 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:32789 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751442AbcHNKVi (ORCPT ); Sun, 14 Aug 2016 06:21:38 -0400 Received: by mail-pa0-f67.google.com with SMTP id vy10so2009425pac.0; Sun, 14 Aug 2016 03:21:38 -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=GJPHgzotdUoQVypBQyM+ztry/KU25PAWCsny2tS094M=; b=o9f1yNY1JGZnEUnABVfnoyA57/KSUfdXZQYp/S9KkHaaxOeD8kLx5DOeIA2dCX3+dw 0ttKaDtA/s3TK1F7SEM1x3dJuN7oT9nVezL37GemX4RZn36h6OgAW1O0GPIJlDUhvMax DzC4fHdHFpN55JoZrZSCsSMIT80ojYqhBJQvRPI3EvDhLkq8Kt8eoi37EN2RRnP8GDqa ywVgK+OK9bIQ/1m5Yg2gHX2xwZ6Jm1taFGPuhqiKsGahTskF/pnh/JcKHzvajZfj014N 9Zg45P1GxniIfeyqe58e9V4Gx9Clbo6DiUpBpzIe2ZLjoL77E+16BrLbooez7EiXkQr0 bX3A== 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=GJPHgzotdUoQVypBQyM+ztry/KU25PAWCsny2tS094M=; b=TsNFIXr4ajO0q3FpIW/xX2QUwC4DDR5ksnZ7WqLkL1GqiOBXSxWpPGq7ZgXFb+IjUJ cX+KXn0e/IMg6LEBRlIjJxM84D7sOD2Zg5KmxHiRmyLZNsCL3y4EqKa/V1d2wqSYp5Av /rKCIkgL15rItb0uXTDNQWA177Up7Ih2GdcWCDhSpZi/FUfWwpRaB2ScpFwFTe9PLDp1 2GzGUdrwbgosUK+aDlWJPqNsQ87m8FvJA+/SAv5h73Fbr/UmYIOaOQILsbgcKAFOLa4/ /ShYvwG3IwDDZ8NsRZ3SbylwLP7pv3PUSk39dJ/uTrn4S/oAUQn01w0TEznO+EIIBtZ+ Nvzg== X-Gm-Message-State: AEkooutzV6hdLANIIxZWpfGpjfcGBOXjAmYTMPAeWPyvhQtRsWAThGlyOHROKcj/U+nyeg== X-Received: by 10.66.20.166 with SMTP id o6mr39916926pae.96.1471128571280; Sat, 13 Aug 2016 15:49:31 -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 81sm22528007pfm.90.2016.08.13.15.49.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Aug 2016 15:49:30 -0700 (PDT) From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, tglx@linutronix.de, torvalds@linux-foundation.org, tytso@mit.edu, viro@zeniv.linux.org.uk, y2038@lists.linaro.org, Steve French Subject: [PATCH v4 13/26] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Date: Sat, 13 Aug 2016 15:48:25 -0700 Message-Id: <1471128518-24075-14-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> References: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@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 Reviewed-by: Arnd Bergmann Cc: Steve French --- 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 8347c90..fd01bf0 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,