summaryrefslogtreecommitdiff
path: root/source4/smb_server/smb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-03-18 19:50:38 +0100
committerJeremy Allison <jra@samba.org>2013-03-20 09:32:26 -0700
commit5a05e687ce724ea808cdb1e6627b9c67804eb879 (patch)
tree8da8951637615eea49848fcae225b99501038863 /source4/smb_server/smb
parentfd88520497b4043e9d81656f7cb56a7b25245c2a (diff)
downloadsamba-5a05e687ce724ea808cdb1e6627b9c67804eb879.tar.gz
samba-5a05e687ce724ea808cdb1e6627b9c67804eb879.tar.bz2
samba-5a05e687ce724ea808cdb1e6627b9c67804eb879.zip
s4:smb_server: fix large read_andx requests
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4/smb_server/smb')
-rw-r--r--source4/smb_server/smb/reply.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index bae6b2ca79..7ce5f5dbaa 100644
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -848,6 +848,7 @@ static void reply_read_and_X_send(struct ntvfs_request *ntvfs)
void smbsrv_reply_read_and_X(struct smbsrv_request *req)
{
union smb_read *io;
+ uint16_t high_part = 0;
/* parse request */
if (req->in.wct != 12) {
@@ -869,13 +870,18 @@ void smbsrv_reply_read_and_X(struct smbsrv_request *req)
io->readx.in.read_for_execute = false;
}
- if (req->smb_conn->negotiate.client_caps & CAP_LARGE_READX) {
- uint32_t high_part = IVAL(req->in.vwv, VWV(7));
- if (high_part == 1) {
- io->readx.in.maxcnt |= high_part << 16;
- }
+ if (req->smb_conn->negotiate.protocol == PROTOCOL_NT1) {
+ high_part = SVAL(req->in.vwv, VWV(7));
}
-
+ if (high_part != UINT16_MAX) {
+ io->readx.in.maxcnt |= high_part << 16;
+ }
+
+ /*
+ * Windows truncates the length to 0x10000
+ */
+ io->readx.in.maxcnt = MIN(io->readx.in.maxcnt, 0x10000);
+
/* the 64 bit variant */
if (req->in.wct == 12) {
uint32_t offset_high = IVAL(req->in.vwv, VWV(10));