Commit b3b3375a authored by Pavel Shilovsky's avatar Pavel Shilovsky

Fix memory over bound bug in cifs_parse_mount_options for 2.6.24

parent 307177ea
......@@ -795,8 +795,7 @@ static int
cifs_parse_mount_options(char *options, const char *devname,
struct smb_vol *vol)
{
char *value;
char *data;
char *value, *data, *end;
unsigned int temp_len, i, j;
char separator[2];
......@@ -834,6 +833,7 @@ cifs_parse_mount_options(char *options, const char *devname,
if (!options)
return 1;
end = options + strlen(options);
if (strncmp(options, "sep=", 4) == 0) {
if (options[4] != 0) {
separator[0] = options[4];
......@@ -898,6 +898,7 @@ cifs_parse_mount_options(char *options, const char *devname,
the only illegal character in a password is null */
if ((value[temp_len] == 0) &&
(value + temp_len < end) &&
(value[temp_len+1] == separator[0])) {
/* reinsert comma */
value[temp_len] = separator[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment