Commit 5f17ed62 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Greg Kroah-Hartman

CIFS: Fix memory over bound bug in cifs_parse_mount_options

commit 4906e50b upstream.

While password processing we can get out of options array bound if
the next character after array is delimiter. The patch adds a check
if we reach the end.
Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 14b5b45f
...@@ -799,8 +799,7 @@ static int ...@@ -799,8 +799,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;
...@@ -843,6 +842,7 @@ cifs_parse_mount_options(char *options, const char *devname, ...@@ -843,6 +842,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];
...@@ -907,6 +907,7 @@ cifs_parse_mount_options(char *options, const char *devname, ...@@ -907,6 +907,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];
......
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