]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
cifs: remove unnecessary copies of tcon->crfid.fid
authorMuhammad Usama Anjum <musamaanjum@gmail.com>
Thu, 15 Apr 2021 15:24:09 +0000 (20:24 +0500)
committerSteve French <stfrench@microsoft.com>
Sun, 25 Apr 2021 21:28:24 +0000 (16:28 -0500)
pfid is being set to tcon->crfid.fid and they are copied in each other
multiple times. Remove the memcopy between same pointers - memory
locations.

Addresses-Coverity: ("Overlapped copy")
Fixes: 9e81e8ff74b9 ("cifs: return cached_fid from open_shroot")
Signed-off-by: Muhammad Usama Anjum <musamaanjum@gmail.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/cifs/smb2ops.c

index 66b20762c2c900740305068a61add11971b47f89..5ccc36d98dadfbf328c752b545701b71032163b9 100644 (file)
@@ -848,11 +848,9 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
                };
 
                /*
-                * caller expects this func to set pfid to a valid
-                * cached root, so we copy the existing one and get a
-                * reference.
+                * caller expects this func to set the fid in crfid to valid
+                * cached root, so increment the refcount.
                 */
-               memcpy(pfid, tcon->crfid.fid, sizeof(*pfid));
                kref_get(&tcon->crfid.refcount);
 
                mutex_unlock(&tcon->crfid.fid_mutex);
@@ -885,7 +883,6 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
        oparms.fid->mid = le64_to_cpu(o_rsp->sync_hdr.MessageId);
 #endif /* CIFS_DEBUG2 */
 
-       memcpy(tcon->crfid.fid, pfid, sizeof(struct cifs_fid));
        tcon->crfid.tcon = tcon;
        tcon->crfid.is_valid = true;
        tcon->crfid.dentry = dentry;
@@ -894,6 +891,10 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
 
        /* BB TBD check to see if oplock level check can be removed below */
        if (o_rsp->OplockLevel == SMB2_OPLOCK_LEVEL_LEASE) {
+               /*
+                * See commit 2f94a3125b87. Increment the refcount when we
+                * get a lease for root, release it if lease break occurs
+                */
                kref_get(&tcon->crfid.refcount);
                tcon->crfid.has_lease = true;
                smb2_parse_contexts(server, o_rsp,