diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-11 11:53:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-11 11:53:42 -0700 |
commit | 33807f4f0daec3b00565c2932d95f614f5833adf (patch) | |
tree | 07a90339612d799a56ce74fad0d4d27c943b875b /kernel | |
parent | adf961d7e8006d2cb16ceee07582b145b9ef69f7 (diff) | |
parent | dca1c8d17a2feae056f9e334ea75a462ae4cb52a (diff) |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"A fix for the problem which Al spotted in cifs_writev and a followup
(noticed when fixing CVE-2014-0069) patch to ensure that cifs never
sends more than the smb frame length over the socket (as we saw with
that cifs_iovec_write problem that Jeff fixed last month)"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cifs: mask off top byte in get_rfc1002_length()
cifs: sanity check length of data to send before sending
CIFS: Fix wrong pos argument of cifs_find_lock_conflict
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions