Skip to content

Commit

Permalink
Cleanup missing frees on some ioctls
Browse files Browse the repository at this point in the history
Cleanup some missing mem frees on some cifs ioctls, and
clarify others to make more obvious that no data is returned.

CC: Stable <[email protected]>
Signed-off-by: Steve French <[email protected]>
Acked-by: Sachin Prabhu <[email protected]>
  • Loading branch information
smfrench committed Oct 14, 2016
1 parent 834170c commit 24df148
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions fs/cifs/smb2ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)
cifs_dbg(FYI, "Link Speed %lld\n",
le64_to_cpu(out_buf->LinkSpeed));
}

kfree(out_buf);
return rc;
}
#endif /* STATS2 */
Expand Down Expand Up @@ -705,6 +705,7 @@ smb2_clone_range(const unsigned int xid,

cchunk_out:
kfree(pcchunk);
kfree(retbuf);
return rc;
}

Expand Down Expand Up @@ -829,7 +830,6 @@ smb2_duplicate_extents(const unsigned int xid,
{
int rc;
unsigned int ret_data_len;
char *retbuf = NULL;
struct duplicate_extents_to_file dup_ext_buf;
struct cifs_tcon *tcon = tlink_tcon(trgtfile->tlink);

Expand All @@ -855,7 +855,7 @@ smb2_duplicate_extents(const unsigned int xid,
FSCTL_DUPLICATE_EXTENTS_TO_FILE,
true /* is_fsctl */, (char *)&dup_ext_buf,
sizeof(struct duplicate_extents_to_file),
(char **)&retbuf,
NULL,
&ret_data_len);

if (ret_data_len > 0)
Expand All @@ -878,7 +878,6 @@ smb3_set_integrity(const unsigned int xid, struct cifs_tcon *tcon,
struct cifsFileInfo *cfile)
{
struct fsctl_set_integrity_information_req integr_info;
char *retbuf = NULL;
unsigned int ret_data_len;

integr_info.ChecksumAlgorithm = cpu_to_le16(CHECKSUM_TYPE_UNCHANGED);
Expand All @@ -890,7 +889,7 @@ smb3_set_integrity(const unsigned int xid, struct cifs_tcon *tcon,
FSCTL_SET_INTEGRITY_INFORMATION,
true /* is_fsctl */, (char *)&integr_info,
sizeof(struct fsctl_set_integrity_information_req),
(char **)&retbuf,
NULL,
&ret_data_len);

}
Expand Down

0 comments on commit 24df148

Please sign in to comment.