diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-11-13 22:41:37 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-11-13 22:41:37 +0000 |
| commit | 133672efbc1085f9af990bdc145e1822ea93bcf3 (patch) | |
| tree | b93b5ba3a9559d137fe7fb86f6d1a3d33189ce0b /fs/cifs/sess.c | |
| parent | 9418d5dc9ba40b88737580457bf3b7c63c60ec43 (diff) | |
| download | linux-stable-133672efbc1085f9af990bdc145e1822ea93bcf3.tar.gz linux-stable-133672efbc1085f9af990bdc145e1822ea93bcf3.tar.bz2 linux-stable-133672efbc1085f9af990bdc145e1822ea93bcf3.zip | |
[CIFS] Fix buffer overflow if server sends corrupt response to small
request
In SendReceive() function in transport.c - it memcpy's
message payload into a buffer passed via out_buf param. The function
assumes that all buffers are of size (CIFSMaxBufSize +
MAX_CIFS_HDR_SIZE) , unfortunately it is also called with smaller
(MAX_CIFS_SMALL_BUFFER_SIZE) buffers. There are eight callers
(SMB worker functions) which are primarily affected by this change:
TreeDisconnect, uLogoff, Close, findClose, SetFileSize, SetFileTimes,
Lock and PosixLock
CC: Dave Kleikamp <shaggy@austin.ibm.com>
CC: Przemyslaw Wegrzyn <czajnik@czajsoft.pl>
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/sess.c')
| -rw-r--r-- | fs/cifs/sess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 899dc6078d9a..ed01ef382aa9 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -514,7 +514,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, iov[1].iov_base = str_area; iov[1].iov_len = count; rc = SendReceive2(xid, ses, iov, 2 /* num_iovecs */, &resp_buf_type, - 0 /* not long op */, 1 /* log NT STATUS if any */ ); + CIFS_STD_OP /* not long */ | CIFS_LOG_ERROR); /* SMB request buf freed in SendReceive2 */ cFYI(1, ("ssetup rc from sendrecv2 is %d", rc)); |