diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-17 13:50:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-17 13:50:11 -0800 |
| commit | 351a7934c0e788262f83380188f18e575f6bc63f (patch) | |
| tree | e9edae6b05459ce1aa4f045be5eb53f705d026ae /fs/cifs/dir.c | |
| parent | 7026f1929e18921fd67bf478f475a8fdfdff16ae (diff) | |
| parent | 2365c4eaf077c48574ab6f143960048fc0f31518 (diff) | |
| download | kernel_replicant_linux-351a7934c0e788262f83380188f18e575f6bc63f.tar.gz kernel_replicant_linux-351a7934c0e788262f83380188f18e575f6bc63f.tar.bz2 kernel_replicant_linux-351a7934c0e788262f83380188f18e575f6bc63f.zip | |
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
Diffstat (limited to 'fs/cifs/dir.c')
| -rw-r--r-- | fs/cifs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index d3a6796caa5a..3db0c5fd9a11 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -378,7 +378,7 @@ cifs_create_get_file_info: xid); else { rc = cifs_get_inode_info(&newinode, full_path, buf, inode->i_sb, - xid, &fid->netfid); + xid, fid); if (newinode) { if (server->ops->set_lease_key) server->ops->set_lease_key(newinode, fid); |