fs/smb: Fix inconsistent refcnt update
Subsystems (2)
PATCH 1/1 fs/smb: Fix inconsistent refcnt update
A possible inconsistent update of refcount was identified in smb2_compound_op. Such inconsistent update could lead to possible resource leaks.
Why it is a possible bug:
1. In the comment section of the function, it clearly states that the reference to cfile should be dropped after calling this function.
2. Every control flow path would check and drop the reference to cfile, except the patched one.
3. Existing callers would not handle refcount update of cfile if -ENOMEM is returned.
To fix the bug, an extra goto label "out" is added, to make sure that the cleanup logic would always be respected. As the problem is caused by the allocation failure of vars, the cleanup logic between label "finished" and "out" can be safely ignored. According to the definition of function is_replayable_error, the error code of "-ENOMEM" is not recoverable. Therefore, the replay logic also gets ignored.
--- fs/smb/client/smb2inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/smb/client/smb2inode.c +5 -2
@@ -207,8 +207,10 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, server =cifs_pick_channel (ses); vars =kzalloc (sizeof (*vars),GFP_ATOMIC ); -if (vars ==NULL ) -return -ENOMEM ; +if (vars ==NULL ) { + rc = -ENOMEM ; + goto out; + } rqst = &vars->rqst[0 ]; rsp_iov = &vars->rsp_iov[0 ];
@@ -864,6 +866,7 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, smb2_should_replay(tcon, &retries, &cur_sleep)) goto replay_again; +out:if (cfile)cifsFileInfo_put (cfile);
Signature · 1 line
2.39.5
merged into cifs-2.6.git pending testing (and added Cc:stable and Acked-by from Paulo)
Let me know if any objections etc
Quoted 53 lines · Shuhao Fu
A possible inconsistent update of refcount was identified in
smb2_compound_op. Such inconsistent update could lead to possible resource leaks.Why it is a possible bug:
1. In the comment section of the function, it clearly states that the reference tocfileshould be dropped after calling this function.
2. Every control flow path would check and drop the reference tocfile, except the patched one.
3. Existing callers would not handle refcount update ofcfileif-ENOMEMis returned.To fix the bug, an extra goto label "out" is added, to make sure that the cleanup logic would always be respected. As the problem is caused by the allocation failure of
vars, the cleanup logic between label "finished" and "out" can be safely ignored. According to the definition of functionis_replayable_error, the error code of "-ENOMEM" is not recoverable. Therefore, the replay logic also gets ignored.Signed-off-by Shuhao Fu <[email protected]>--- fs/smb/client/smb2inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)fs/smb/client/smb2inode.c +5
-3@@ -207,8 +207,10 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, server =cifs_pick_channel (ses); vars =kzalloc (sizeof (*vars),GFP_ATOMIC ); -if (vars ==NULL ) -return -ENOMEM ; +if (vars ==NULL ) { + rc = -ENOMEM ; + goto out; + } rqst = &vars->rqst[0 ]; rsp_iov = &vars->rsp_iov[0 ];@@ -864,6 +866,7 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, smb2_should_replay(tcon, &retries, &cur_sleep)) goto replay_again; +out:if (cfile)cifsFileInfo_put (cfile); --2.39.5
Signature · 3 lines
Thanks, Steve