From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani 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> References: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: linux-cifs@vger.kernel.org, Arnd Bergmann , y2038@lists.linaro.org, samba-technical@lists.samba.org, Steve French , Al Viro , Thomas Gleixner , Linus Torvalds To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Return-path: In-Reply-To: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" List-Id: linux-cifs.vger.kernel.org VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgdGhlIHBhdGNoIHRoYXQgdHJhbnNpdGlvbnMKdmZz IHRpbWVzdGFtcHMgdG8gdXNlIDY0IGJpdCB0aW1lIGFuZCBoZW5jZSBtYWtlIHRoZW0KeTIwMzgg c2FmZS4KCkNVUlJFTlRfVElNRSBtYWNybyB3aWxsIGJlIGRlbGV0ZWQgYmVmb3JlIG1lcmdpbmcg dGhlCmFmb3JlbWVudGlvbmVkIHBhdGNoLgoKRmlsZXN5c3RlbSB0aW1lcyB3aWxsIHVzZSBjdXJy ZW50X2ZzX3RpbWUoKSBpbnN0ZWFkIG9mCkNVUlJFTlRfVElNRS4KVXNlIGt0aW1lX2dldF9yZWFs X3RzKCkgaGVyZSBhcyB0aGlzIGlzIG5vdCBmaWxlc3lzdGVtIHRpbWUuCmt0aW1lX2dldF9yZWFs X3RzKCkgcmV0dXJucyB0aGUgdGltZXN0YW1wIGluIG5zIHdoaWNoIGNhbgpiZSB1c2VkIHRvIGNh bGN1bGF0ZSBuZXR3b3JrIHRpbWUgZm9yIE5UTE12MiBhdXRoZW50aWNhdGlvbgp0aW1lc3RhbXAu CgpBbGwgY2lmcyB0aW1lc3RhbXBzIGN1cnJlbnRseSB1c2UgdGltZXNwZWMgaW50ZXJuYWxseS4K VGhpcyB0aW1lc3RhbXAgY2FuIGFsc28gYmUgdHJhbnNpdGlvbmVkIGludG8gdXNpbmcKdGltZXNw ZWM2NCB3aGVuIGFsbCBvdGhlciB0aW1lc3RhbXBzIGZvciBjaWZzIGlzIHRyYW5zaXRpb25lZAp0 byB1c2UgdGltZXNwZWM2NC4KClNpZ25lZC1vZmYtYnk6IERlZXBhIERpbmFtYW5pIDxkZWVwYS5r ZXJuZWxAZ21haWwuY29tPgpDYzogU3RldmUgRnJlbmNoIDxzZnJlbmNoQHNhbWJhLm9yZz4KQ2M6 IGxpbnV4LWNpZnNAdmdlci5rZXJuZWwub3JnCkNjOiBzYW1iYS10ZWNobmljYWxAbGlzdHMuc2Ft YmEub3JnCi0tLQogZnMvY2lmcy9jaWZzZW5jcnlwdC5jIHwgNCArKystCiAxIGZpbGUgY2hhbmdl ZCwgMyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZnMvY2lmcy9j aWZzZW5jcnlwdC5jIGIvZnMvY2lmcy9jaWZzZW5jcnlwdC5jCmluZGV4IDZhZWI4ZDQuLmI4NmNl NjcgMTAwNjQ0Ci0tLSBhL2ZzL2NpZnMvY2lmc2VuY3J5cHQuYworKysgYi9mcy9jaWZzL2NpZnNl bmNyeXB0LmMKQEAgLTQ3MSw2ICs0NzEsNyBAQCBmaW5kX3RpbWVzdGFtcChzdHJ1Y3QgY2lmc19z ZXMgKnNlcykKIAl1bnNpZ25lZCBjaGFyICpibG9icHRyOwogCXVuc2lnbmVkIGNoYXIgKmJsb2Jl bmQ7CiAJc3RydWN0IG50bG1zc3AyX25hbWUgKmF0dHJwdHI7CisJc3RydWN0IHRpbWVzcGVjIHRz OwogCiAJaWYgKCFzZXMtPmF1dGhfa2V5LmxlbiB8fCAhc2VzLT5hdXRoX2tleS5yZXNwb25zZSkK IAkJcmV0dXJuIDA7CkBAIC00OTUsNyArNDk2LDggQEAgZmluZF90aW1lc3RhbXAoc3RydWN0IGNp ZnNfc2VzICpzZXMpCiAJCWJsb2JwdHIgKz0gYXR0cnNpemU7IC8qIGFkdmFuY2UgYXR0ciB2YWx1 ZSAqLwogCX0KIAotCXJldHVybiBjcHVfdG9fbGU2NChjaWZzX1VuaXhUaW1lVG9OVChDVVJSRU5U X1RJTUUpKTsKKwlrdGltZV9nZXRfcmVhbF90cygmdHMpOworCXJldHVybiBjcHVfdG9fbGU2NChj aWZzX1VuaXhUaW1lVG9OVCh0cykpOwogfQogCiBzdGF0aWMgaW50IGNhbGNfbnRsbXYyX2hhc2go c3RydWN0IGNpZnNfc2VzICpzZXMsIGNoYXIgKm50bG12Ml9oYXNoLAotLSAKMS45LjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClkyMDM4IG1haWxpbmcg bGlzdApZMjAzOEBsaXN0cy5saW5hcm8ub3JnCmh0dHBzOi8vbGlzdHMubGluYXJvLm9yZy9tYWls bWFuL2xpc3RpbmZvL3kyMDM4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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> 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-fsdevel-owner@vger.kernel.org List-ID: 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, -- 1.9.1