[SCM] Samba Shared Repository - branch master updated - 9a3be6f0f8e120797a02fa1be60b51812cfd86f5

[Jeremy Allison]

On Fri, Nov 28, 2008 at 02:17:01AM -0600, Volker Lendecke wrote:
> The branch, master has been updated
> 
> commit 738271fc2026b2911b7d20a73496989641714df3
> Author: Volker Lendecke <vl at samba.org>
> Date:   Sat Nov 8 16:14:12 2008 +0100
> 
>     Remove the variable "size" from reply_nttrans
>     
>     This converts the range checks for the setup[] array to rely on req->wct being
>     set correctly in init_smb_request. As that already verifies the vwv array to be
>     in the range of the smb_request inbuf, we don't have to do overflow checks here
>     anymore.
>     
>     Jeremy, please check thoroughly! :-)

Checked. Actually, I think this is redundent due to
the code above in reply_nttrans()

        /*
         * All nttrans messages we handle have smb_wct == 19 +
         * state->setup_count.  Ensure this is so as a sanity check.
         */

        if(req->wct != 19 + (state->setup_count/2)) {
                DEBUG(2,("Invalid smb_wct %d in nttrans call (should be %d)\n",
                         req->wct, 19 + (state->setup_count/2)));
                goto bad_param;
        }

but it doesn't hurt. Belt and braces and all that :-).

> commit 9da3101e449649f0614240f13157ac81e17b2e90
> Author: Volker Lendecke <vl at samba.org>
> Date:   Sat Nov 8 16:14:12 2008 +0100
> 
>     Remove the variable "size" from reply_trans
>     
>     This converts the range checks for the setup[] array to rely on req->wct being
>     set correctly in init_smb_request. As that already verifies the vwv array to be
>     in the range of the smb_request inbuf, we don't have to do overflow checks here
>     anymore.
>     
>     Jeremy, please check thoroughly! :-)

Checked.

Both these changes make sense to me. Thanks,

Jeremy.