lkml.org 
[lkml]   [2016]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 077/112] SMB3: GUIDs should be constructed as random but valid uuids
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Steve French <smfrench@gmail.com>

    commit fa70b87cc6641978b20e12cc5d517e9ffc0086d4 upstream.

    GUIDs although random, and 16 bytes, need to be generated as
    proper uuids.

    Signed-off-by: Steve French <steve.french@primarydata.com>
    Reviewed-by: Aurelien Aptel <aaptel@suse.com>
    Reported-by: David Goebels <davidgoe@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/cifs/cifsfs.c | 2 +-
    fs/cifs/connect.c | 2 +-
    fs/cifs/smb2ops.c | 2 +-
    fs/cifs/smb2pdu.c | 2 +-
    4 files changed, 4 insertions(+), 4 deletions(-)

    --- a/fs/cifs/cifsfs.c
    +++ b/fs/cifs/cifsfs.c
    @@ -268,7 +268,7 @@ cifs_alloc_inode(struct super_block *sb)
    cifs_inode->createtime = 0;
    cifs_inode->epoch = 0;
    #ifdef CONFIG_CIFS_SMB2
    - get_random_bytes(cifs_inode->lease_key, SMB2_LEASE_KEY_SIZE);
    + generate_random_uuid(cifs_inode->lease_key);
    #endif
    /*
    * Can not set i_flags here - they get immediately overwritten to zero
    --- a/fs/cifs/connect.c
    +++ b/fs/cifs/connect.c
    @@ -2200,7 +2200,7 @@ cifs_get_tcp_session(struct smb_vol *vol
    memcpy(&tcp_ses->dstaddr, &volume_info->dstaddr,
    sizeof(tcp_ses->dstaddr));
    #ifdef CONFIG_CIFS_SMB2
    - get_random_bytes(tcp_ses->client_guid, SMB2_CLIENT_GUID_SIZE);
    + generate_random_uuid(tcp_ses->client_guid);
    #endif
    /*
    * at this point we are the only ones with the pointer
    --- a/fs/cifs/smb2ops.c
    +++ b/fs/cifs/smb2ops.c
    @@ -1037,7 +1037,7 @@ smb2_set_lease_key(struct inode *inode,
    static void
    smb2_new_lease_key(struct cifs_fid *fid)
    {
    - get_random_bytes(fid->lease_key, SMB2_LEASE_KEY_SIZE);
    + generate_random_uuid(fid->lease_key);
    }

    #define SMB2_SYMLINK_STRUCT_SIZE \
    --- a/fs/cifs/smb2pdu.c
    +++ b/fs/cifs/smb2pdu.c
    @@ -1186,7 +1186,7 @@ create_durable_v2_buf(struct cifs_fid *p

    buf->dcontext.Timeout = 0; /* Should this be configurable by workload */
    buf->dcontext.Flags = cpu_to_le32(SMB2_DHANDLE_FLAG_PERSISTENT);
    - get_random_bytes(buf->dcontext.CreateGuid, 16);
    + generate_random_uuid(buf->dcontext.CreateGuid);
    memcpy(pfid->create_guid, buf->dcontext.CreateGuid, 16);

    /* SMB2_CREATE_DURABLE_HANDLE_REQUEST is "DH2Q" */

    \
     
     \ /
      Last update: 2016-10-26 14:53    [W:4.116 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site