lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/10] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts()
    Date
    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
    \
     
     \ /
      Last update: 2016-02-03 07:42    [W:5.265 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site