diff options
author | Linus Torvalds | 2013-11-28 09:50:25 -0800 |
---|---|---|
committer | Linus Torvalds | 2013-11-28 09:50:25 -0800 |
commit | 3bad8bb5cd3048a67df43ac6b1e2f191f19d9ff0 (patch) | |
tree | bc18e38958f63b6ffb8514e16729f094925e4d5b /fs/pnode.c | |
parent | 5ecbe3c3c690b5ab493c730c317475287a9e8b45 (diff) | |
parent | f19e84df37bda502a2248d507a9cf2b9e693279e (diff) |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"SMB3 "validate negotiate" is needed to prevent certain types of
downgrade attacks.
Also changes SMB2/SMB3 copy offload from using the BTRFS copy ioctl
(BTRFS_IOC_CLONE) to a cifs specific ioctl (CIFS_IOC_COPYCHUNK_FILE)
to address Christoph's comment that there are semantic differences
between requesting copy offload in which copy-on-write is mandatory
(as in the BTRFS ioctl) and optional in the SMB2/SMB3 case. Also
fixes SMB2/SMB3 copychunk for large files"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
[CIFS] Do not use btrfs refcopy ioctl for SMB2 copy offload
Check SMB3 dialects against downgrade attacks
Removed duplicated (and unneeded) goto
CIFS: Fix SMB2/SMB3 Copy offload support (refcopy) for large files
Diffstat (limited to 'fs/pnode.c')
0 files changed, 0 insertions, 0 deletions