Skip to content

E
etercifs
Commit 2f8b9a12 authored by Pavel Shilovsky's avatar Pavel Shilovsky
Browse files
Options

Bugfixes for 2.6.33

Fix memory over bound bug in cifs_parse_mount_options + stable updates
parent 39caaf06
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
sources/2.6.33/connect.c
View file @ 2f8b9a12
...@@ -800,8 +800,7 @@ static int ...@@ -800,8 +800,7 @@ static int
cifs_parse_mount_options(char *options, const char *devname, cifs_parse_mount_options(char *options, const char *devname,
struct smb_vol *vol) struct smb_vol *vol)
{ {
char *value; char *value, *data, *end;
char *data;
unsigned int temp_len, i, j; unsigned int temp_len, i, j;
char separator[2]; char separator[2];
short int override_uid = -1; short int override_uid = -1;
...@@ -844,6 +843,7 @@ cifs_parse_mount_options(char *options, const char *devname, ...@@ -844,6 +843,7 @@ cifs_parse_mount_options(char *options, const char *devname,
if (!options) if (!options)
return 1; return 1;
end = options + strlen(options);
if (strncmp(options, "sep=", 4) == 0) { if (strncmp(options, "sep=", 4) == 0) {
if (options[4] != 0) { if (options[4] != 0) {
separator[0] = options[4]; separator[0] = options[4];
...@@ -908,6 +908,7 @@ cifs_parse_mount_options(char *options, const char *devname, ...@@ -908,6 +908,7 @@ cifs_parse_mount_options(char *options, const char *devname,
the only illegal character in a password is null */ the only illegal character in a password is null */
if ((value[temp_len] == 0) && if ((value[temp_len] == 0) &&
(value + temp_len < end) &&
(value[temp_len+1] == separator[0])) { (value[temp_len+1] == separator[0])) {
/* reinsert comma */ /* reinsert comma */
value[temp_len] = separator[0]; value[temp_len] = separator[0];
...@@ -2540,7 +2541,7 @@ try_mount_again: ...@@ -2540,7 +2541,7 @@ try_mount_again:
remote_path_check: remote_path_check:
/* check if a whole path (including prepath) is not remote */ /* check if a whole path (including prepath) is not remote */
if (!rc && cifs_sb->prepathlen && tcon) { if (!rc && tcon) {
/* build_path_to_root works only when we have a valid tcon */ /* build_path_to_root works only when we have a valid tcon */
full_path = cifs_build_path_to_root(cifs_sb); full_path = cifs_build_path_to_root(cifs_sb);
if (full_path == NULL) { if (full_path == NULL) {
......
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