diff options
| author | Richard Sharpe <realrichardsharpe@gmail.com> | 2012-12-04 17:21:29 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-12-06 01:31:08 +0100 |
| commit | 943797c232f96a5dd411a803ad90b6980b2785b0 (patch) | |
| tree | 5be9a3bc7ce5b61c936aa2bf9bbf2ce036f8a11a | |
| parent | 2618d67fe5eda1e86f90de2fcde90c048fbcd50b (diff) | |
| download | samba-943797c232f96a5dd411a803ad90b6980b2785b0.tar.gz samba-943797c232f96a5dd411a803ad90b6980b2785b0.tar.bz2 samba-943797c232f96a5dd411a803ad90b6980b2785b0.zip | |
Fix bug #9460 - Samba 3.6.x and Master respond incorrectly to FILE_STREAM_INFO requests.
Ensure we check the buffer size correctly.
Reviewed by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Dec 6 01:31:08 CET 2012 on sn-devel-104
| -rw-r--r-- | source3/smbd/trans2.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 61d755c03f..9c77f4d3f9 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -4159,7 +4159,7 @@ static NTSTATUS marshall_stream_info(unsigned int num_streams, unsigned int i; unsigned int ofs = 0; - for (i = 0; i < num_streams && ofs <= max_data_bytes; i++) { + for (i = 0; i < num_streams; i++) { unsigned int next_offset; size_t namelen; smb_ucs2_t *namebuf; @@ -4178,6 +4178,16 @@ static NTSTATUS marshall_stream_info(unsigned int num_streams, namelen -= 2; + /* + * We cannot overflow ... + */ + if ((ofs + 24 + namelen) > max_data_bytes) { + DEBUG(10, ("refusing to overflow reply at stream %u\n", + i)); + TALLOC_FREE(namebuf); + return STATUS_BUFFER_OVERFLOW; + } + SIVAL(data, ofs+4, namelen); SOFF_T(data, ofs+8, streams[i].size); SOFF_T(data, ofs+16, streams[i].alloc_size); @@ -4192,6 +4202,14 @@ static NTSTATUS marshall_stream_info(unsigned int num_streams, else { unsigned int align = ndr_align_size(next_offset, 8); + if ((next_offset + align) > max_data_bytes) { + DEBUG(10, ("refusing to overflow align " + "reply at stream %u\n", + i)); + TALLOC_FREE(namebuf); + return STATUS_BUFFER_OVERFLOW; + } + memset(data+next_offset, 0, align); next_offset += align; @@ -4202,6 +4220,8 @@ static NTSTATUS marshall_stream_info(unsigned int num_streams, ofs = next_offset; } + DEBUG(10, ("max_data: %u, data_size: %u\n", max_data_bytes, ofs)); + *data_size = ofs; return NT_STATUS_OK; @@ -4801,6 +4821,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn, if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("marshall_stream_info failed: %s\n", nt_errstr(status))); + TALLOC_FREE(streams); return status; } |