From: Ralph Wuerthner Date: Thu, 4 Apr 2013 10:59:36 +0000 (+0200) Subject: s3:smbd: do not access data behind req->buf+req->buflen in srvstr_get_path_req_wcard() X-Git-Tag: tdb-1.2.12~587 X-Git-Url: http://git.samba.org/samba.git/?p=herb%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=98f9e5edd35d6fb54dea74f799b017967b0a13fd s3:smbd: do not access data behind req->buf+req->buflen in srvstr_get_path_req_wcard() Reviewed-by: Volker Lendecke Reviewed-by: Michael Adam --- diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 0d9f415a434..5fb10d5c54d 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -318,9 +318,16 @@ size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request *req, char **pp_dest, const char *src, int flags, NTSTATUS *err, bool *contains_wcard) { - return srvstr_get_path_wcard(mem_ctx, (const char *)req->inbuf, req->flags2, - pp_dest, src, smbreq_bufrem(req, src), - flags, err, contains_wcard); + ssize_t bufrem = smbreq_bufrem(req, src); + + if (bufrem < 0) { + *err = NT_STATUS_INVALID_PARAMETER; + return 0; + } + + return srvstr_get_path_wcard(mem_ctx, (const char *)req->inbuf, + req->flags2, pp_dest, src, bufrem, flags, + err, contains_wcard); } size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req,