cifs: Fix cached_fid refcnt leak in open_shroot
authorXiyu Yang <xiyuyang19@fudan.edu.cn>
Sat, 13 Jun 2020 12:27:09 +0000 (20:27 +0800)
committerSteve French <stfrench@microsoft.com>
Mon, 22 Jun 2020 03:34:50 +0000 (22:34 -0500)
open_shroot() invokes kref_get(), which increases the refcount of the
"tcon->crfid" object. When open_shroot() returns not zero, it means the
open operation failed and close_shroot() will not be called to decrement
the refcount of the "tcon->crfid".

The reference counting issue happens in one normal path of
open_shroot(). When the cached root have been opened successfully in a
concurrent process, the function increases the refcount and jump to
"oshr_free" to return. However the current return value "rc" may not
equal to 0, thus the increased refcount will not be balanced outside the
function, causing a refcnt leak.

Fix this issue by setting the value of "rc" to 0 before jumping to
"oshr_free" label.

Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>
fs/cifs/smb2ops.c

index 736d86b8a910bcab8f59d25dac8e4ca3465a2cee..28553d45604e8feafa3cf5d1301676fd4f94b86b 100644 (file)
@@ -763,6 +763,7 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
                        /* close extra handle outside of crit sec */
                        SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);
                }
+               rc = 0;
                goto oshr_free;
        }