From 9693ffb4803163c65a26ff0a6344753b478a320e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 8 Nov 2008 17:14:06 +0100 Subject: [PATCH] Fix the offset checks in the trans routines This fixes a potential crash bug, a client can make us read memory we should not read. Luckily I got the disp checks right... Volker (cherry picked from commit 64a1d80851da5b05e70ec6c96f6e9bd473748369) (cherry picked from commit f04c5650a3aeca23591ddc781c4b297caaf9bb3f) (cherry picked from commit 5718a4761af9b77ea17b64f12f1010c99f738c96) --- source/smbd/ipc.c | 6 +++--- source/smbd/nttrans.c | 6 +++--- source/smbd/trans2.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c index a824ab7fd35..ac5950ec09a 100644 --- a/source/smbd/ipc.c +++ b/source/smbd/ipc.c @@ -767,10 +767,10 @@ void reply_transs(struct smb_request *req) goto bad_param; } - if (ddisp > av_size || + if (doff > av_size || dcnt > av_size || - ddisp+dcnt > av_size || - ddisp+dcnt < ddisp) { + doff+dcnt > av_size || + doff+dcnt < doff) { goto bad_param; } diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c index c08b5ee20a5..671b9e93d44 100644 --- a/source/smbd/nttrans.c +++ b/source/smbd/nttrans.c @@ -2817,10 +2817,10 @@ void reply_nttranss(struct smb_request *req) goto bad_param; } - if (ddisp > av_size || + if (doff > av_size || dcnt > av_size || - ddisp+dcnt > av_size || - ddisp+dcnt < ddisp) { + doff+dcnt > av_size || + doff+dcnt < doff) { goto bad_param; } diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index ad0554e928a..804fa210092 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -7805,10 +7805,10 @@ void reply_transs2(struct smb_request *req) goto bad_param; } - if (ddisp > av_size || + if (doff > av_size || dcnt > av_size || - ddisp+dcnt > av_size || - ddisp+dcnt < ddisp) { + doff+dcnt > av_size || + doff+dcnt < doff) { goto bad_param; } -- 2.11.4.GIT