Attachment 599891 Details for Bug 841183 – Updated patch to address PCP fetch PDU decoding issues

[patch] Updated patch to address PCP fetch PDU decoding issues

pcp_fetch.patch (text/plain), 1.36 KB, created by Nathan Scott on 2012-07-24 02:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Scott

Created: 2012-07-24 02:40:10 UTC

Size: 1.36 KB

patch

obsolete

>diff --git a/src/libpcp/src/p_fetch.c b/src/libpcp/src/p_fetch.c
>index 046917e..9443513 100644
>--- a/src/libpcp/src/p_fetch.c
>+++ b/src/libpcp/src/p_fetch.c
>@@ -66,18 +66,33 @@ __pmSendFetch(int fd, int from, int ctxnum, __pmTimeval *when, int numpmid, pmID
> }
> 
> int
>-__pmDecodeFetch(__pmPDU *pdubuf, int *ctxnum, __pmTimeval *when, int *numpmid, pmID **pmidlist)
>+__pmDecodeFetch(__pmPDU *pdubuf, int *ctxnum, __pmTimeval *when, int *numpmidp, pmID **pmidlist)
> {
>     fetch_t	*pp;
>+    char	*pduend;
>+    int		numpmid;
>     int		j;
> 
>     pp = (fetch_t *)pdubuf;
>+    pduend = (char *)pdubuf + pp->hdr.len;
>+
>+    if (pduend - (char*)pp < sizeof(fetch_t))
>+	return PM_ERR_IPC;
>+    numpmid = ntohl(pp->numpmid);
>+    if (numpmid <= 0)
>+	return PM_ERR_IPC;
>+    if (numpmid >= (INT_MAX - sizeof(fetch_t)) / sizeof(pmID))
>+	return PM_ERR_IPC;
>+    if ((pduend - (char*)pp) != sizeof(fetch_t) + ((sizeof(pmID)) * (numpmid-1)))
>+	return PM_ERR_IPC;
>+
>+    for (j = 0; j < numpmid; j++)
>+	pp->pmidlist[j] = __ntohpmID(pp->pmidlist[j]);
>+
>     *ctxnum = ntohl(pp->ctxnum);
>     when->tv_sec = ntohl(pp->when.tv_sec);
>     when->tv_usec = ntohl(pp->when.tv_usec);
>-    *numpmid = ntohl(pp->numpmid);
>-    for (j = 0; j < *numpmid; j++)
>-	pp->pmidlist[j] = __ntohpmID(pp->pmidlist[j]);
>+    *numpmidp = numpmid;
>     *pmidlist = pp->pmidlist;
>     __pmPinPDUBuf((void *)pdubuf);
>     return 0;

Actions: View | Diff

Attachments on bug 841183: 599665 | 599891