lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CIFS] cifs: fix oops on mount when CONFIG_CIFS_DFS_UPCALL is enabled

Browse Source 
simple "mount -t cifs //xxx /mnt" oopsed on strlen of options
http://kerneloops.org/guilty.php?guilty=cifs_get_sb&version=2.6.25-release&start=16711 \
68&end=1703935&class=oops

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French
2008-06-10 21:37:02 +00:00
parent dbdbb87636
commit 79ee9a8b2d
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/cifs/cifsfs.c
View File

@@ -97,9 +97,6 @@ cifs_read_super(struct super_block *sb, void *data,
{ {
struct inode *inode; struct inode *inode;
struct cifs_sb_info *cifs_sb; struct cifs_sb_info *cifs_sb;
#ifdef CONFIG_CIFS_DFS_UPCALL
int len;
#endif
int rc = 0; int rc = 0;
/* BB should we make this contingent on mount parm? */ /* BB should we make this contingent on mount parm? */
@@ -117,7 +114,8 @@ cifs_read_super(struct super_block *sb, void *data,
* complex operation (mount), and in case of fail * complex operation (mount), and in case of fail
* just exit instead of doing mount and attempting * just exit instead of doing mount and attempting
* undo it if this copy fails?*/ * undo it if this copy fails?*/
len = strlen(data); if (data) {
int len = strlen(data);
cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL); cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL);
if (cifs_sb->mountdata == NULL) { if (cifs_sb->mountdata == NULL) {
kfree(sb->s_fs_info); kfree(sb->s_fs_info);
@@ -126,6 +124,7 @@ cifs_read_super(struct super_block *sb, void *data,
} }
strncpy(cifs_sb->mountdata, data, len + 1); strncpy(cifs_sb->mountdata, data, len + 1);
cifs_sb->mountdata[len] = '\0'; cifs_sb->mountdata[len] = '\0';
}
#endif #endif
rc = cifs_mount(sb, cifs_sb, data, devname); rc = cifs_mount(sb, cifs_sb, data, devname);