diff options
author | Jeremy Allison <jra@samba.org> | 2008-04-07 21:11:16 -0700 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2008-04-08 15:31:43 +0200 |
commit | 3eac564a2ef9aaf9d8238f09a493a4f12c8b93ba (patch) | |
tree | fa0e649260496bc718d8a8b8bc483c1d290a3542 /source/smbd/nttrans.c | |
parent | 1ad74f1906fa4e78c95ea3f7ac9de7a34539f83d (diff) | |
download | samba-3eac564a2ef9aaf9d8238f09a493a4f12c8b93ba.tar.gz samba-3eac564a2ef9aaf9d8238f09a493a4f12c8b93ba.tar.xz samba-3eac564a2ef9aaf9d8238f09a493a4f12c8b93ba.zip |
Rewrite the wrap checks to deal with gcc 4.x optimisations.
Karolin, please pull once Volker has reviewed. Thanks.
Jeremy.
(cherry picked from commit 09852899cadc48abe2f2651ecbceaf881198e648)
Diffstat (limited to 'source/smbd/nttrans.c')
-rw-r--r-- | source/smbd/nttrans.c | 89 |
1 files changed, 51 insertions, 38 deletions
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c index 60e546450b8..6bcf499516e 100644 --- a/source/smbd/nttrans.c +++ b/source/smbd/nttrans.c @@ -2557,14 +2557,15 @@ static void handle_nttrans(connection_struct *conn, void reply_nttrans(struct smb_request *req) { connection_struct *conn = req->conn; - uint32 pscnt; - uint32 psoff; - uint32 dscnt; - uint32 dsoff; + uint32_t pscnt; + uint32_t psoff; + uint32_t dscnt; + uint32_t dsoff; uint16 function_code; NTSTATUS result; struct trans_state *state; - int size; + uint32_t size; + uint32_t av_size; START_PROFILE(SMBnttrans); @@ -2575,6 +2576,7 @@ void reply_nttrans(struct smb_request *req) } size = smb_len(req->inbuf) + 4; + av_size = smb_len(req->inbuf); pscnt = IVAL(req->inbuf,smb_nt_ParameterCount); psoff = IVAL(req->inbuf,smb_nt_ParameterOffset); dscnt = IVAL(req->inbuf,smb_nt_DataCount); @@ -2650,12 +2652,17 @@ void reply_nttrans(struct smb_request *req) END_PROFILE(SMBnttrans); return; } - if ((dsoff+dscnt < dsoff) || (dsoff+dscnt < dscnt)) + + if (dscnt > state->total_data || + dsoff+dscnt < dsoff) { goto bad_param; - if ((smb_base(req->inbuf)+dsoff+dscnt - > (char *)req->inbuf + size) || - (smb_base(req->inbuf)+dsoff+dscnt < smb_base(req->inbuf))) + } + + if (dsoff > av_size || + dscnt > av_size || + dsoff+dscnt > av_size) { goto bad_param; + } memcpy(state->data,smb_base(req->inbuf)+dsoff,dscnt); } @@ -2672,12 +2679,17 @@ void reply_nttrans(struct smb_request *req) END_PROFILE(SMBnttrans); return; } - if ((psoff+pscnt < psoff) || (psoff+pscnt < pscnt)) + + if (pscnt > state->total_param || + psoff+pscnt < psoff) { goto bad_param; - if ((smb_base(req->inbuf)+psoff+pscnt - > (char *)req->inbuf + size) || - (smb_base(req->inbuf)+psoff+pscnt < smb_base(req->inbuf))) + } + + if (psoff > av_size || + pscnt > av_size || + psoff+pscnt > av_size) { goto bad_param; + } memcpy(state->param,smb_base(req->inbuf)+psoff,pscnt); } @@ -2749,10 +2761,10 @@ void reply_nttrans(struct smb_request *req) void reply_nttranss(struct smb_request *req) { connection_struct *conn = req->conn; - unsigned int pcnt,poff,dcnt,doff,pdisp,ddisp; + uint32_t pcnt,poff,dcnt,doff,pdisp,ddisp; struct trans_state *state; - - int size; + uint32_t av_size; + uint32_t size; START_PROFILE(SMBnttranss); @@ -2789,6 +2801,7 @@ void reply_nttranss(struct smb_request *req) } size = smb_len(req->inbuf) + 4; + av_size = smb_len(req->inbuf); pcnt = IVAL(req->inbuf,smb_nts_ParameterCount); poff = IVAL(req->inbuf, smb_nts_ParameterOffset); @@ -2806,38 +2819,38 @@ void reply_nttranss(struct smb_request *req) goto bad_param; if (pcnt) { - if (pdisp+pcnt > state->total_param) - goto bad_param; - if ((pdisp+pcnt < pdisp) || (pdisp+pcnt < pcnt)) - goto bad_param; - if (pdisp > state->total_param) + if (pdisp > state->total_param || + pcnt > state->total_param || + pdisp+pcnt > state->total_param || + pdisp+pcnt < pdisp) { goto bad_param; - if ((smb_base(req->inbuf) + poff + pcnt - > (char *)req->inbuf + size) || - (smb_base(req->inbuf) + poff + pcnt - < smb_base(req->inbuf))) - goto bad_param; - if (state->param + pdisp < state->param) + } + + if (poff > av_size || + pcnt > av_size || + poff+pcnt > av_size || + poff+pcnt < poff) { goto bad_param; + } memcpy(state->param+pdisp, smb_base(req->inbuf)+poff, pcnt); } if (dcnt) { - if (ddisp+dcnt > state->total_data) - goto bad_param; - if ((ddisp+dcnt < ddisp) || (ddisp+dcnt < dcnt)) + if (ddisp > state->total_data || + dcnt > state->total_data || + ddisp+dcnt > state->total_data || + ddisp+dcnt < ddisp) { goto bad_param; - if (ddisp > state->total_data) - goto bad_param; - if ((smb_base(req->inbuf) + doff + dcnt - > (char *)req->inbuf + size) || - (smb_base(req->inbuf) + doff + dcnt - < smb_base(req->inbuf))) - goto bad_param; - if (state->data + ddisp < state->data) + } + + if (ddisp > av_size || + dcnt > av_size || + ddisp+dcnt > av_size || + ddisp+dcnt < ddisp) { goto bad_param; + } memcpy(state->data+ddisp, smb_base(req->inbuf)+doff, dcnt); |