From: Deepa Dinamani <deepa.kernel@gmail.com> To: linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org Cc: linux-cifs@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>, Arnd Bergmann <arnd@arndb.de>, samba-technical@lists.samba.org, Dave Chinner <david@fromorbit.com>, linux-kernel@vger.kernel.org, Steve French <sfrench@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 [thread overview] Message-ID: <1454479670-8204-5-git-send-email-deepa.kernel@gmail.com> (raw) In-Reply-To: <1454479670-8204-1-git-send-email-deepa.kernel@gmail.com> 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 <deepa.kernel@gmail.com> Cc: Steve French <sfrench@samba.org> 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 _______________________________________________ Y2038 mailing list Y2038@lists.linaro.org https://lists.linaro.org/mailman/listinfo/y2038
WARNING: multiple messages have this Message-ID (diff)
From: Deepa Dinamani <deepa.kernel@gmail.com> To: linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org Cc: Arnd Bergmann <arnd@arndb.de>, Dave Chinner <david@fromorbit.com>, "Theodore Ts'o" <tytso@mit.edu>, linux-kernel@vger.kernel.org, Steve French <sfrench@samba.org>, 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 [thread overview] Message-ID: <1454479670-8204-5-git-send-email-deepa.kernel@gmail.com> (raw) In-Reply-To: <1454479670-8204-1-git-send-email-deepa.kernel@gmail.com> 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 <deepa.kernel@gmail.com> Cc: Steve French <sfrench@samba.org> 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
next prev parent reply other threads:[~2016-02-03 6:07 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-03 6:07 [PATCH 00/10] Remove CURRENT_TIME and CURRENT_TIME_SEC - PART 1 Deepa Dinamani 2016-02-03 6:07 ` [PATCH 01/10] fs: Add current_fs_time_sec() function Deepa Dinamani 2016-02-03 6:07 ` [PATCH 02/10] vfs: Replace CURRENT_TIME by current_fs_time() Deepa Dinamani 2016-02-03 6:07 ` [PATCH 03/10] fs: cifs: Replace CURRENT_TIME with current_fs_time() Deepa Dinamani 2016-02-03 6:07 ` Deepa Dinamani [this message] 2016-02-03 6:07 ` [PATCH 04/10] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Deepa Dinamani 2016-02-03 6:07 ` [PATCH 05/10] fs: cifs: Replace CURRENT_TIME by get_seconds Deepa Dinamani 2016-02-03 6:07 ` [PATCH 06/10] fs: ext4: Replace CURRENT_TIME_SEC with current_fs_time_sec() Deepa Dinamani 2016-02-03 6:07 ` [PATCH 07/10] fs: ext4: Replace CURRENT_TIME with ext4_current_time() Deepa Dinamani 2016-02-03 6:07 ` [PATCH 08/10] fs: ceph: replace CURRENT_TIME by current_fs_time() Deepa Dinamani 2016-02-03 6:22 ` Yan, Zheng 2016-02-03 6:22 ` Yan, Zheng 2016-02-03 6:07 ` [PATCH 09/10] fs: ceph: Replace CURRENT_TIME by ktime_get_real_ts() Deepa Dinamani 2016-02-03 6:07 ` Deepa Dinamani 2016-02-03 14:34 ` Yan, Zheng 2016-02-03 14:58 ` Ilya Dryomov 2016-02-03 16:17 ` Deepa Dinamani 2016-02-03 21:27 ` Arnd Bergmann 2016-02-04 2:00 ` Yan, Zheng 2016-02-04 2:00 ` Yan, Zheng 2016-02-04 8:30 ` Arnd Bergmann 2016-02-04 9:01 ` Ilya Dryomov 2016-02-04 13:31 ` Arnd Bergmann 2016-02-04 15:26 ` Gregory Farnum 2016-02-04 21:02 ` [Y2038] " Arnd Bergmann 2016-02-04 21:02 ` Arnd Bergmann 2016-02-03 6:07 ` [PATCH 10/10] fs: btrfs: Replace CURRENT_TIME by current_fs_time() Deepa Dinamani 2016-02-04 14:14 ` David Sterba 2016-02-05 11:39 ` Deepa Dinamani 2016-02-07 7:57 ` [PATCH v2 " Deepa Dinamani 2016-02-08 15:08 ` David Sterba 2016-02-03 21:30 ` [Y2038] [PATCH 00/10] Remove CURRENT_TIME and CURRENT_TIME_SEC - PART 1 Arnd Bergmann 2016-02-04 4:56 ` Deepa Dinamani
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1454479670-8204-5-git-send-email-deepa.kernel@gmail.com \ --to=deepa.kernel@gmail.com \ --cc=arnd@arndb.de \ --cc=david@fromorbit.com \ --cc=linux-cifs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=samba-technical@lists.samba.org \ --cc=sfrench@samba.org \ --cc=tytso@mit.edu \ --cc=y2038@lists.linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.