From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH 04/10] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Date: Tue, 2 Feb 2016 22:07:44 -0800 Message-ID: <1454479670-8204-5-git-send-email-deepa.kernel@gmail.com> References: <1454479670-8204-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, Theodore Ts'o , Arnd Bergmann , samba-technical@lists.samba.org, Dave Chinner , linux-kernel@vger.kernel.org, Steve French To: linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org Return-path: In-Reply-To: <1454479670-8204-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 VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgdGhlIHNlcmllcyB0aGF0IHRyYW5zaXRpb25zCmZp bGVzeXN0ZW0gdGltZXN0YW1wcyB0byB1c2UgNjQgYml0IHRpbWUgYW5kIGhlbmNlIG1ha2UKdGhl bSB5MjAzOCBzYWZlLgoKQ1VSUkVOVF9USU1FIG1hY3JvIHdpbGwgYmUgZGVsZXRlZCBiZWZvcmUg bWVyZ2luZyB0aGUKYWZvcmVtZW50aW9uZWQgc2VyaWVzLgoKRmlsZXN5c3RlbSB0aW1lcyB3aWxs IHVzZSBjdXJyZW50X2ZzX3RpbWUoKSBpbnN0ZWFkIG9mCkNVUlJFTlRfVElNRS4KVXNlIGt0aW1l X2dldF9yZWFsX3RzKCkgaGVyZSBhcyB0aGlzIGlzIG5vdCBmaWxlc3lzdGVtIHRpbWUuCmt0aW1l X2dldF9yZWFsX3RzKCkgcmV0dXJucyB0aGUgdGltZXN0YW1wIGluIG5zIHdoaWNoIGNhbgpiZSB1 c2VkIHRvIGNhbGN1bGF0ZSBuZXR3b3JrIHRpbWUgZm9yIE5UTE12MiBhdXRoZW50aWNhdGlvbgp0 aW1lc3RhbXAuCgpTaWduZWQtb2ZmLWJ5OiBEZWVwYSBEaW5hbWFuaSA8ZGVlcGEua2VybmVsQGdt YWlsLmNvbT4KQ2M6IFN0ZXZlIEZyZW5jaCA8c2ZyZW5jaEBzYW1iYS5vcmc+CkNjOiBsaW51eC1j aWZzQHZnZXIua2VybmVsLm9yZwpDYzogc2FtYmEtdGVjaG5pY2FsQGxpc3RzLnNhbWJhLm9yZwot LS0KIGZzL2NpZnMvY2lmc2VuY3J5cHQuYyB8IDQgKysrLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5z ZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2ZzL2NpZnMvY2lmc2VuY3J5 cHQuYyBiL2ZzL2NpZnMvY2lmc2VuY3J5cHQuYwppbmRleCBkNDExNjU0Li5mODZlMDdkIDEwMDY0 NAotLS0gYS9mcy9jaWZzL2NpZnNlbmNyeXB0LmMKKysrIGIvZnMvY2lmcy9jaWZzZW5jcnlwdC5j CkBAIC00NjAsNiArNDYwLDcgQEAgZmluZF90aW1lc3RhbXAoc3RydWN0IGNpZnNfc2VzICpzZXMp CiAJdW5zaWduZWQgY2hhciAqYmxvYnB0cjsKIAl1bnNpZ25lZCBjaGFyICpibG9iZW5kOwogCXN0 cnVjdCBudGxtc3NwMl9uYW1lICphdHRycHRyOworCXN0cnVjdCB0aW1lc3BlYyB0czsKIAogCWlm ICghc2VzLT5hdXRoX2tleS5sZW4gfHwgIXNlcy0+YXV0aF9rZXkucmVzcG9uc2UpCiAJCXJldHVy biAwOwpAQCAtNDg0LDcgKzQ4NSw4IEBAIGZpbmRfdGltZXN0YW1wKHN0cnVjdCBjaWZzX3NlcyAq c2VzKQogCQlibG9icHRyICs9IGF0dHJzaXplOyAvKiBhZHZhbmNlIGF0dHIgdmFsdWUgKi8KIAl9 CiAKLQlyZXR1cm4gY3B1X3RvX2xlNjQoY2lmc19Vbml4VGltZVRvTlQoQ1VSUkVOVF9USU1FKSk7 CisJa3RpbWVfZ2V0X3JlYWxfdHMoJnRzKTsKKwlyZXR1cm4gY3B1X3RvX2xlNjQoY2lmc19Vbml4 VGltZVRvTlQodHMpKTsKIH0KIAogc3RhdGljIGludCBjYWxjX250bG12Ml9oYXNoKHN0cnVjdCBj aWZzX3NlcyAqc2VzLCBjaGFyICpudGxtdjJfaGFzaCwKLS0gCjEuOS4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpZMjAzOCBtYWlsaW5nIGxpc3QKWTIw MzhAbGlzdHMubGluYXJvLm9yZwpodHRwczovL2xpc3RzLmxpbmFyby5vcmcvbWFpbG1hbi9saXN0 aW5mby95MjAzOAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org Cc: Arnd Bergmann , Dave Chinner , "Theodore Ts'o" , linux-kernel@vger.kernel.org, Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org Subject: [PATCH 04/10] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Date: Tue, 2 Feb 2016 22:07:44 -0800 Message-Id: <1454479670-8204-5-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1454479670-8204-1-git-send-email-deepa.kernel@gmail.com> References: <1454479670-8204-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: This is in preparation for the series that transitions filesystem timestamps to use 64 bit time and hence make them y2038 safe. CURRENT_TIME macro will be deleted before merging the aforementioned series. 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. 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 d411654..f86e07d 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -460,6 +460,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; @@ -484,7 +485,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