Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French: "Three cifs fixes, the most important fixing the problem with passing bogus pointers with writev (CVE-2014-0069). Two additional cifs fixes are still in review (including the fix for an append problem which Al also discovered)" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: CIFS: Fix too big maxBuf size for SMB3 mounts cifs: ensure that uncached writes handle unmapped areas correctly [CIFS] Fix cifsacl mounts over smb2 to not call cifs
Showing
- fs/cifs/cifsacl.c 24 additions, 9 deletionsfs/cifs/cifsacl.c
- fs/cifs/cifsglob.h 2 additions, 0 deletionsfs/cifs/cifsglob.h
- fs/cifs/cifsproto.h 4 additions, 2 deletionsfs/cifs/cifsproto.h
- fs/cifs/dir.c 1 addition, 1 deletionfs/cifs/dir.c
- fs/cifs/file.c 35 additions, 4 deletionsfs/cifs/file.c
- fs/cifs/inode.c 1 addition, 1 deletionfs/cifs/inode.c
- fs/cifs/smb1ops.c 1 addition, 0 deletionsfs/cifs/smb1ops.c
- fs/cifs/smb2glob.h 3 additions, 0 deletionsfs/cifs/smb2glob.h
- fs/cifs/smb2ops.c 4 additions, 10 deletionsfs/cifs/smb2ops.c
- fs/cifs/smb2pdu.c 3 additions, 1 deletionfs/cifs/smb2pdu.c
Loading
Please register or sign in to comment