lkml.org 
[lkml]   [2013]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 087/104] nfsd: Decode and send 64bit time values
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bryan Schumaker <bjschuma@netapp.com>

    commit bf8d909705e9d9bac31d9b8eac6734d2b51332a7 upstream.

    The seconds field of an nfstime4 structure is 64bit, but we are assuming
    that the first 32bits are zero-filled. So if the client tries to set
    atime to a value before the epoch (touch -t 196001010101), then the
    server will save the wrong value on disk.

    Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfsd/nfs4xdr.c | 19 +++++--------------
    1 file changed, 5 insertions(+), 14 deletions(-)

    --- a/fs/nfsd/nfs4xdr.c
    +++ b/fs/nfsd/nfs4xdr.c
    @@ -344,10 +344,7 @@ nfsd4_decode_fattr(struct nfsd4_compound
    all 32 bits of 'nseconds'. */
    READ_BUF(12);
    len += 12;
    - READ32(dummy32);
    - if (dummy32)
    - return nfserr_inval;
    - READ32(iattr->ia_atime.tv_sec);
    + READ64(iattr->ia_atime.tv_sec);
    READ32(iattr->ia_atime.tv_nsec);
    if (iattr->ia_atime.tv_nsec >= (u32)1000000000)
    return nfserr_inval;
    @@ -370,10 +367,7 @@ nfsd4_decode_fattr(struct nfsd4_compound
    all 32 bits of 'nseconds'. */
    READ_BUF(12);
    len += 12;
    - READ32(dummy32);
    - if (dummy32)
    - return nfserr_inval;
    - READ32(iattr->ia_mtime.tv_sec);
    + READ64(iattr->ia_mtime.tv_sec);
    READ32(iattr->ia_mtime.tv_nsec);
    if (iattr->ia_mtime.tv_nsec >= (u32)1000000000)
    return nfserr_inval;
    @@ -2386,8 +2380,7 @@ out_acl:
    if (bmval1 & FATTR4_WORD1_TIME_ACCESS) {
    if ((buflen -= 12) < 0)
    goto out_resource;
    - WRITE32(0);
    - WRITE32(stat.atime.tv_sec);
    + WRITE64((s64)stat.atime.tv_sec);
    WRITE32(stat.atime.tv_nsec);
    }
    if (bmval1 & FATTR4_WORD1_TIME_DELTA) {
    @@ -2400,15 +2393,13 @@ out_acl:
    if (bmval1 & FATTR4_WORD1_TIME_METADATA) {
    if ((buflen -= 12) < 0)
    goto out_resource;
    - WRITE32(0);
    - WRITE32(stat.ctime.tv_sec);
    + WRITE64((s64)stat.ctime.tv_sec);
    WRITE32(stat.ctime.tv_nsec);
    }
    if (bmval1 & FATTR4_WORD1_TIME_MODIFY) {
    if ((buflen -= 12) < 0)
    goto out_resource;
    - WRITE32(0);
    - WRITE32(stat.mtime.tv_sec);
    + WRITE64((s64)stat.mtime.tv_sec);
    WRITE32(stat.mtime.tv_nsec);
    }
    if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) {



    \
     
     \ /
      Last update: 2013-05-07 02:21    [W:4.331 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site