diff options
| author | Jeremy Allison <jra@samba.org> | 2005-04-10 06:57:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:34 -0500 |
| commit | 000323887350793440c360eba2be7729a7b5c4b0 (patch) | |
| tree | 95c76c213f6067662d90d08a16b3ff37162b611a | |
| parent | 2c83fb4a06c916e9a68677089a1590a12a9a779f (diff) | |
| download | samba-000323887350793440c360eba2be7729a7b5c4b0.tar.gz samba-000323887350793440c360eba2be7729a7b5c4b0.tar.bz2 samba-000323887350793440c360eba2be7729a7b5c4b0.zip | |
r6269: With help from Marcel Müller <mueller@maazl.de> in tracking down the bug,
fix trans2 and nttrans secondary packet processing. We were being too strict checking
the incoming packet (by 1 byte).
Jeremy.
(This used to be commit 3eea1ff4b7428325c7f304bcac61d6297209a4b8)
| -rw-r--r-- | source3/smbd/nttrans.c | 7 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 4dffe870c5..a3ffaad24a 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -2946,6 +2946,9 @@ due to being in oplock break state.\n", (unsigned int)function_code )); ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT); + /* We need to re-calcuate the new length after we've read the secondary packet. */ + length = smb_len(inbuf) + 4; + /* * The sequence number for the trans reply is always * based on the last secondary received. @@ -2993,7 +2996,7 @@ due to being in oplock break state.\n", (unsigned int)function_code )); goto bad_param; if (parameter_displacement > total_parameter_count) goto bad_param; - if ((smb_base(inbuf) + parameter_offset + parameter_count >= inbuf + bufsize) || + if ((smb_base(inbuf) + parameter_offset + parameter_count > inbuf + length) || (smb_base(inbuf) + parameter_offset + parameter_count < smb_base(inbuf))) goto bad_param; if (parameter_displacement + params < params) @@ -3010,7 +3013,7 @@ due to being in oplock break state.\n", (unsigned int)function_code )); goto bad_param; if (data_displacement > total_data_count) goto bad_param; - if ((smb_base(inbuf) + data_offset + data_count >= inbuf + bufsize) || + if ((smb_base(inbuf) + data_offset + data_count > inbuf + length) || (smb_base(inbuf) + data_offset + data_count < smb_base(inbuf))) goto bad_param; if (data_displacement + data < data) diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 1868ce8fe4..adc6322ac3 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -4885,6 +4885,9 @@ int reply_trans2(connection_struct *conn, unsigned int data_off; ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT); + + /* We need to re-calcuate the new length after we've read the secondary packet. */ + length = smb_len(inbuf) + 4; /* * The sequence number for the trans reply is always @@ -4932,7 +4935,7 @@ int reply_trans2(connection_struct *conn, goto bad_param; if (param_disp > total_params) goto bad_param; - if ((smb_base(inbuf) + param_off + num_params >= inbuf + bufsize) || + if ((smb_base(inbuf) + param_off + num_params > inbuf + length) || (smb_base(inbuf) + param_off + num_params < smb_base(inbuf))) goto bad_param; if (params + param_disp < params) @@ -4948,7 +4951,7 @@ int reply_trans2(connection_struct *conn, goto bad_param; if (data_disp > total_data) goto bad_param; - if ((smb_base(inbuf) + data_off + num_data >= inbuf + bufsize) || + if ((smb_base(inbuf) + data_off + num_data > inbuf + length) || (smb_base(inbuf) + data_off + num_data < smb_base(inbuf))) goto bad_param; if (data + data_disp < data) |