lkml.org 
[lkml]   [2016]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/21] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts()
    Date
    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 <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 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
    \
     
     \ /
      Last update: 2016-06-09 07:41    [W:5.952 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site