diff options
| -rw-r--r-- | source3/smbd/nttrans.c | 22 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 15 |
2 files changed, 19 insertions, 18 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index b6951272d7..567c428bb8 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -91,14 +91,11 @@ void send_nt_replies(connection_struct *conn, + alignment_offset + data_alignment_offset); - /* - * useable_space can never be more than max_send minus the - * alignment offset. - */ - - useable_space = MIN(useable_space, - max_send - (alignment_offset+data_alignment_offset)); - + if (useable_space < 0) { + DEBUG(0, ("send_nt_replies failed sanity useable_space " + "= %d!!!", useable_space)); + exit_server_cleanly("send_nt_replies: srv_send_smb failed."); + } while (params_to_send || data_to_send) { @@ -106,8 +103,7 @@ void send_nt_replies(connection_struct *conn, * Calculate whether we will totally or partially fill this packet. */ - total_sent_thistime = params_to_send + data_to_send + - alignment_offset + data_alignment_offset; + total_sent_thistime = params_to_send + data_to_send; /* * We can never send more than useable_space. @@ -115,7 +111,9 @@ void send_nt_replies(connection_struct *conn, total_sent_thistime = MIN(total_sent_thistime, useable_space); - reply_outbuf(req, 18, total_sent_thistime); + reply_outbuf(req, 18, + total_sent_thistime + alignment_offset + + data_alignment_offset); /* * Set total params and data to be sent. @@ -242,7 +240,7 @@ void send_nt_replies(connection_struct *conn, if(params_to_send < 0 || data_to_send < 0) { DEBUG(0,("send_nt_replies failed sanity check pts = %d, dts = %d\n!!!", params_to_send, data_to_send)); - return; + exit_server_cleanly("send_nt_replies: internal error"); } } } diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 8d839b66b3..3c1753354b 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -744,14 +744,16 @@ void send_trans2_replies(connection_struct *conn, + alignment_offset + data_alignment_offset); - /* useable_space can never be more than max_send minus the alignment offset. */ - - useable_space = MIN(useable_space, max_send - (alignment_offset+data_alignment_offset)); + if (useable_space < 0) { + DEBUG(0, ("send_trans2_replies failed sanity useable_space " + "= %d!!!", useable_space)); + exit_server_cleanly("send_trans2_replies: Not enough space"); + } while (params_to_send || data_to_send) { /* Calculate whether we will totally or partially fill this packet */ - total_sent_thistime = params_to_send + data_to_send + alignment_offset + data_alignment_offset; + total_sent_thistime = params_to_send + data_to_send; /* We can never send more than useable_space */ /* @@ -761,9 +763,10 @@ void send_trans2_replies(connection_struct *conn, * are sent here. Fix from Marc_Jacobsen@hp.com. */ - total_sent_thistime = MIN(total_sent_thistime, useable_space+ alignment_offset + data_alignment_offset); + total_sent_thistime = MIN(total_sent_thistime, useable_space); - reply_outbuf(req, 10, total_sent_thistime); + reply_outbuf(req, 10, total_sent_thistime + alignment_offset + + data_alignment_offset); /* Set total params and data to be sent */ SSVAL(req->outbuf,smb_tprcnt,paramsize); |