Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37d4f99b authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: fix error handling when calling cifs_parse_devname 



When we allowed separate unc= and prefixpath= mount options, we could
ignore EINVAL errors from cifs_parse_devname. Now that they are
deprecated, we need to check for that as well and fail the mount if it's
malformed.

Also fix a later error message that refers to the unc= option.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 539673ff

fs/cifs/connect.c

+13 −9
Original line number Diff line number Diff line
@@ -1258,14 +1258,18 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
	vol->backupuid_specified = false; /* no backup intent for a user */

	vol->backupgid_specified = false; /* no backup intent for a group */



	/*

	 * For now, we ignore -EINVAL errors under the assumption that the

	 * unc= and prefixpath= options will be usable.

	 */

	if (cifs_parse_devname(devname, vol) == -ENOMEM) {

		printk(KERN_ERR "CIFS: Unable to allocate memory to parse "

				"device string.\n");

		goto out_nomem;

	switch (cifs_parse_devname(devname, vol)) {

	case 0:

		break;

	case -ENOMEM:

		cifs_dbg(VFS, "Unable to allocate memory for devname.\n");

		goto cifs_parse_mount_err;

	case -EINVAL:

		cifs_dbg(VFS, "Malformed UNC in devname.\n");

		goto cifs_parse_mount_err;

	default:

		cifs_dbg(VFS, "Unknown error parsing devname.\n");

		goto cifs_parse_mount_err;

	}



	while ((data = strsep(&options, separator)) != NULL) {
@@ -1827,7 +1831,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
	}

#endif

	if (!vol->UNC) {

		cifs_dbg(VFS, "CIFS mount error: No usable UNC path provided in device string or in unc= option!\n");

		cifs_dbg(VFS, "CIFS mount error: No usable UNC path provided in device string!\n");

		goto cifs_parse_mount_err;

	}