cifs: Fix missed free operations
Subsystems (2)
PATCH 1/1 cifs: Fix missed free operations
cifs_setattr_nounix has two paths which miss free operations for xid and fullpath.
Use goto cifs_setattr_exit like other paths to fix them.
--- fs/cifs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/cifs/inode.c +2 -2
@@ -2475,9 +2475,9 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) rc = tcon->ses->server->ops->flush (xid, tcon, &wfile->fid);cifsFileInfo_put (wfile);if (rc) -return rc; + goto cifs_setattr_exit; }else if (rc != -EBADF ) -return rc; + goto cifs_setattr_exit;else rc =0 ; }
Signature · 1 line
2.20.1
пн, 14 окт. 2019 г. в 00:18, Chuhong Yuan <[email protected]>:
Quoted 28 lines
cifs_setattr_nounixhas two paths which miss free operations for xid and fullpath.
Use gotocifs_setattr_exitlike other paths to fix them.Fixes aa081859b10c ("cifs: flush before set-info if we have writeable handles")Signed-off-by Chuhong Yuan <[email protected]>--- fs/cifs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/cifs/inode.c +2
-3@@ -2475,9 +2475,9 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) rc = tcon->ses->server->ops->flush (xid, tcon, &wfile->fid);cifsFileInfo_put (wfile);if (rc) -return rc; + goto cifs_setattr_exit; }else if (rc != -EBADF ) -return rc; + goto cifs_setattr_exit;else rc =0 ; } --
Quoted 2 lines
2.20.1
Looks good, thanks.
The original patch was tagged for stable, so, it seems that this one should be tagged too.
--
Best regards,
Pavel Shilovsky
Steve French
AppliedMerged into cifs-2.6.git for-next and cc: stable for 5.3
Quoted 44 lines · Pavel Shilovsky via samba-technical
пн, 14 окт. 2019 г. в 00:18, Chuhong Yuan <[email protected]>:
Quoted 28 lines
cifs_setattr_nounixhas two paths which miss free operations for xid and fullpath.
Use gotocifs_setattr_exitlike other paths to fix them.Fixes aa081859b10c ("cifs: flush before set-info if we have writeable handles")Signed-off-by Chuhong Yuan <[email protected]>--- fs/cifs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/cifs/inode.c +2
-3@@ -2475,9 +2475,9 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) rc = tcon->ses->server->ops->flush (xid, tcon, &wfile->fid);cifsFileInfo_put (wfile);if (rc) -return rc; + goto cifs_setattr_exit; }else if (rc != -EBADF ) -return rc; + goto cifs_setattr_exit;else rc =0 ; } --Quoted 2 lines
2.20.1
Looks good, thanks.
Reviewed-by Pavel Shilovsky <[email protected]>The original patch was tagged for stable, so, it seems that this one should be tagged too.
--
Best regards,
Pavel Shilovsky
Signature · 3 lines
Thanks, Steve