Commit 2ef499a7 authored by Konstantin Baev's avatar Konstantin Baev

update sources/2.6.28

- source: cifs-2.6.git - refspec: v2.6.28-etercifs - commit: aeb70a892d3b6f2c8ba8fe7de44393714780f8dd merge with new kernel minor version (v2.6.28.8)
parent 9146ef34
Fix oops in cifs_dfs_ref.c when prefixpath is not reachable when using DFS.
Version 1.55 Version 1.55
------------ ------------
Various fixes to make delete of open files behavior more predictable Various fixes to make delete of open files behavior more predictable
......
...@@ -228,7 +228,7 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft, ...@@ -228,7 +228,7 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft,
kfree(ses->serverOS); kfree(ses->serverOS);
/* UTF-8 string will not grow more than four times as big as UCS-16 */ /* UTF-8 string will not grow more than four times as big as UCS-16 */
ses->serverOS = kzalloc(4 * len, GFP_KERNEL); ses->serverOS = kzalloc((4 * len) + 2 /* trailing null */, GFP_KERNEL);
if (ses->serverOS != NULL) if (ses->serverOS != NULL)
cifs_strfromUCS_le(ses->serverOS, (__le16 *)data, len, nls_cp); cifs_strfromUCS_le(ses->serverOS, (__le16 *)data, len, nls_cp);
data += 2 * (len + 1); data += 2 * (len + 1);
...@@ -241,7 +241,7 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft, ...@@ -241,7 +241,7 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft,
return rc; return rc;
kfree(ses->serverNOS); kfree(ses->serverNOS);
ses->serverNOS = kzalloc(4 * len, GFP_KERNEL); /* BB this is wrong length FIXME BB */ ses->serverNOS = kzalloc((4 * len) + 2 /* trailing null */, GFP_KERNEL);
if (ses->serverNOS != NULL) { if (ses->serverNOS != NULL) {
cifs_strfromUCS_le(ses->serverNOS, (__le16 *)data, len, cifs_strfromUCS_le(ses->serverNOS, (__le16 *)data, len,
nls_cp); nls_cp);
......
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