evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cifs: always zero out smb_vol before parsing options

Browse source 
Currently, the code relies on the callers to do that and they all do,
but this will ensure that it's always done.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Jeff Layton 2012-11-26 11:09:57 -05:00 • committed by Steve French
parent 9fa114f74f
commit 6ee9542a87
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/cifs/connect.c
View file

@ -1122,6 +1122,9 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
separator[1] = 0; separator[1] = 0;
delim = separator[0]; delim = separator[0];
/* ensure we always start with zeroed-out smb_vol */
memset(vol, 0, sizeof(*vol));
/* /*
* does not have to be perfect mapping since field is * does not have to be perfect mapping since field is
* informational, only used for servers that do not support * informational, only used for servers that do not support
@ -3314,7 +3317,6 @@ expand_dfs_referral(const unsigned int xid, struct cifs_ses *ses,
mdata = NULL; mdata = NULL;
} else { } else {
cleanup_volume_info_contents(volume_info); cleanup_volume_info_contents(volume_info);
memset(volume_info, '\0', sizeof(*volume_info));
rc = cifs_setup_volume_info(volume_info, mdata, rc = cifs_setup_volume_info(volume_info, mdata,
fake_devname); fake_devname);
} }
@ -3336,7 +3338,6 @@ cifs_setup_volume_info(struct smb_vol *volume_info, char *mount_data,
if (cifs_parse_mount_options(mount_data, devname, volume_info)) if (cifs_parse_mount_options(mount_data, devname, volume_info))
return -EINVAL; return -EINVAL;
if (volume_info->nullauth) { if (volume_info->nullauth) {
cFYI(1, "Anonymous login"); cFYI(1, "Anonymous login");
kfree(volume_info->username); kfree(volume_info->username);
@ -3373,7 +3374,7 @@ cifs_get_volume_info(char *mount_data, const char *devname)
int rc; int rc;
struct smb_vol *volume_info; struct smb_vol *volume_info;
volume_info = kzalloc(sizeof(struct smb_vol), GFP_KERNEL); volume_info = kmalloc(sizeof(struct smb_vol), GFP_KERNEL);
if (!volume_info) if (!volume_info)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);