mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-07 03:18:31 +00:00
Code Issues Releases Wiki Activity

smb: client: fix warning in cifs_smb3_do_mount()

Browse source 
[ Upstream commit 12c30f33cc ]

This fixes the following warning reported by kernel test robot

  fs/smb/client/cifsfs.c:982 cifs_smb3_do_mount() warn: possible
  memory leak of 'cifs_sb'

Link: https://lore.kernel.org/all/202306170124.CtQqzf0I-lkp@intel.com/
Signed-off-by: Paulo Alcantara (SUSE) <pc@manguebit.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Paulo Alcantara 2023-06-19 16:24:37 -03:00 committed by Greg Kroah-Hartman
parent c4f7f31b3a
commit eb79f8dfba
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fs/smb/client/cifsfs.c
View file

@ -884,11 +884,11 @@ struct dentry *
cifs_smb3_do_mount(struct file_system_type *fs_type, cifs_smb3_do_mount(struct file_system_type *fs_type,
int flags, struct smb3_fs_context *old_ctx) int flags, struct smb3_fs_context *old_ctx)
{ {
int rc;
struct super_block *sb = NULL;
struct cifs_sb_info *cifs_sb = NULL;
struct cifs_mnt_data mnt_data; struct cifs_mnt_data mnt_data;
struct cifs_sb_info *cifs_sb;
struct super_block *sb;
struct dentry *root; struct dentry *root;
int rc;
if (cifsFYI) { if (cifsFYI) {
cifs_dbg(FYI, "%s: devname=%s flags=0x%x\n", __func__, cifs_dbg(FYI, "%s: devname=%s flags=0x%x\n", __func__,
@ -897,11 +897,9 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
cifs_info("Attempting to mount %s\n", old_ctx->source); cifs_info("Attempting to mount %s\n", old_ctx->source);
} }
cifs_sb = kzalloc(sizeof(struct cifs_sb_info), GFP_KERNEL); cifs_sb = kzalloc(sizeof(*cifs_sb), GFP_KERNEL);
if (cifs_sb == NULL) { if (!cifs_sb)
root = ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
goto out;
}
cifs_sb->ctx = kzalloc(sizeof(struct smb3_fs_context), GFP_KERNEL); cifs_sb->ctx = kzalloc(sizeof(struct smb3_fs_context), GFP_KERNEL);
if (!cifs_sb->ctx) { if (!cifs_sb->ctx) {
@ -938,10 +936,8 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
sb = sget(fs_type, cifs_match_super, cifs_set_super, flags, &mnt_data); sb = sget(fs_type, cifs_match_super, cifs_set_super, flags, &mnt_data);
if (IS_ERR(sb)) { if (IS_ERR(sb)) {
root = ERR_CAST(sb);
cifs_umount(cifs_sb); cifs_umount(cifs_sb);
cifs_sb = NULL; return ERR_CAST(sb);
goto out;
} }
if (sb->s_root) { if (sb->s_root) {
@ -972,13 +968,9 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
deactivate_locked_super(sb); deactivate_locked_super(sb);
return root; return root;
out: out:
if (cifs_sb) {
if (!sb || IS_ERR(sb)) { /* otherwise kill_sb will handle */
kfree(cifs_sb->prepath); kfree(cifs_sb->prepath);
smb3_cleanup_fs_context(cifs_sb->ctx); smb3_cleanup_fs_context(cifs_sb->ctx);
kfree(cifs_sb); kfree(cifs_sb);
}
}
return root; return root;
} }