提交 e4327859 编写于 作者: L Linus Torvalds

Merge branch 'for-3.10' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fix from Steve French:
 "Fix one byte buffer overrun with prefixpaths on cifs mounts which can
  cause a problem with mount depending on the string length"

* 'for-3.10' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix off-by-one bug in build_unc_path_to_root
...@@ -3279,8 +3279,8 @@ build_unc_path_to_root(const struct smb_vol *vol, ...@@ -3279,8 +3279,8 @@ build_unc_path_to_root(const struct smb_vol *vol,
pos = full_path + unc_len; pos = full_path + unc_len;
if (pplen) { if (pplen) {
*pos++ = CIFS_DIR_SEP(cifs_sb); *pos = CIFS_DIR_SEP(cifs_sb);
strncpy(pos, vol->prepath, pplen); strncpy(pos + 1, vol->prepath, pplen);
pos += pplen; pos += pplen;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册