> From: Marcin Slusarz <marcin.slusarz@gmail.com>
>
> 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...
>
> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
> Cc: Steve French <sfrench@samba.org>
> Cc: <stable@kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> fs/cifs/cifsfs.c | 21 ++++++++++-----------
> 1 file changed, 10 insertions(+), 11 deletions(-)
>
> diff -puN fs/cifs/cifsfs.c~cifs-fix-oops-on-mount-when-config_cifs_dfs_upcall-is-enabled fs/cifs/cifsfs.c
> --- a/fs/cifs/cifsfs.c~cifs-fix-oops-on-mount-when-config_cifs_dfs_upcall-is-enabled
> +++ a/fs/cifs/cifsfs.c
> @@ -124,9 +124,6 @@ cifs_read_super(struct super_block *sb,
> {
> struct inode *inode;
> struct cifs_sb_info *cifs_sb;
> -#ifdef CONFIG_CIFS_DFS_UPCALL
> - int len;
> -#endif
> int rc = 0;
>
> /* BB should we make this contingent on mount parm? */
> @@ -144,15 +141,17 @@ cifs_read_super(struct super_block *sb,
> * complex operation (mount), and in case of fail
> * just exit instead of doing mount and attempting
> * undo it if this copy fails?*/
> - len = strlen(data);
> - cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL);
> - if (cifs_sb->mountdata == NULL) {
> - kfree(sb->s_fs_info);
> - sb->s_fs_info = NULL;
> - return -ENOMEM;
> + if (data) {
> + int len = strlen(data);
> + cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL);
> + if (cifs_sb->mountdata == NULL) {
> + kfree(sb->s_fs_info);
> + sb->s_fs_info = NULL;
> + return -ENOMEM;
> + }
> + strncpy(cifs_sb->mountdata, data, len + 1);
> + cifs_sb->mountdata[len] = '__PLACEHOLDER__0_';
> }
> - strncpy(cifs_sb->mountdata, data, len + 1);
> - cifs_sb->mountdata[len] = '__PLACEHOLDER__0_';
> #endif
>
> rc = cifs_mount(sb, cifs_sb, data, devname);
> _
>
