diff options
-rw-r--r-- | fs/cifs/connect.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 78db68a5cf44..5b3840725d01 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -1653,24 +1653,26 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, | |||
1653 | * If yes, we have encountered a double deliminator | 1653 | * If yes, we have encountered a double deliminator |
1654 | * reset the NULL character to the deliminator | 1654 | * reset the NULL character to the deliminator |
1655 | */ | 1655 | */ |
1656 | if (tmp_end < end && tmp_end[1] == delim) | 1656 | if (tmp_end < end && tmp_end[1] == delim) { |
1657 | tmp_end[0] = delim; | 1657 | tmp_end[0] = delim; |
1658 | 1658 | ||
1659 | /* Keep iterating until we get to a single deliminator | 1659 | /* Keep iterating until we get to a single |
1660 | * OR the end | 1660 | * deliminator OR the end |
1661 | */ | 1661 | */ |
1662 | while ((tmp_end = strchr(tmp_end, delim)) != NULL && | 1662 | while ((tmp_end = strchr(tmp_end, delim)) |
1663 | (tmp_end[1] == delim)) { | 1663 | != NULL && (tmp_end[1] == delim)) { |
1664 | tmp_end = (char *) &tmp_end[2]; | 1664 | tmp_end = (char *) &tmp_end[2]; |
1665 | } | 1665 | } |
1666 | 1666 | ||
1667 | /* Reset var options to point to next element */ | 1667 | /* Reset var options to point to next element */ |
1668 | if (tmp_end) { | 1668 | if (tmp_end) { |
1669 | tmp_end[0] = '\0'; | 1669 | tmp_end[0] = '\0'; |
1670 | options = (char *) &tmp_end[1]; | 1670 | options = (char *) &tmp_end[1]; |
1671 | } else | 1671 | } else |
1672 | /* Reached the end of the mount option string */ | 1672 | /* Reached the end of the mount option |
1673 | options = end; | 1673 | * string */ |
1674 | options = end; | ||
1675 | } | ||
1674 | 1676 | ||
1675 | /* Now build new password string */ | 1677 | /* Now build new password string */ |
1676 | temp_len = strlen(value); | 1678 | temp_len = strlen(value); |