Attachment 602222 Details for Bug 841159 – Fix regression in PCP archive reading

[patch] Fix regression in PCP archive reading

logread_pdu_fix (text/plain), 1.80 KB, created by Nathan Scott on 2012-08-04 04:58:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Scott

Created: 2012-08-04 04:58:45 UTC

Size: 1.80 KB

patch

obsolete

>Fix a recent regression in log record decoding
>
>The routines for decoding log records stored in PCP archives
>share some code with the live host PDU decoding logic.  They
>make use of __pmDecodeResult, in particular. So, before this
>change (and with the result decoding fixes), they no longer
>function because the buffer they pass in for decoding does
>not have a proper PDU header.
>
>Previously this was not a problem, but now the decode routine
>looks at the PDU header to determine the size of the buffer
>being decoded.  The fix is straight-forward - simply ensure
>those header fields are initialised appropriately.
>
>
>Index: pcp/src/libpcp/src/logutil.c
>===================================================================
>--- pcp.orig/src/libpcp/src/logutil.c	2012-08-04 14:25:20.697958503 +1000
>+++ pcp/src/libpcp/src/logutil.c	2012-08-04 14:46:13.098031788 +1000
>@@ -1322,9 +1322,7 @@ paranoidCheck(int len, __pmPDU *pb)
> static int
> paranoidLogRead(__pmLogCtl *lcp, int mode, FILE *peekf, pmResult **result)
> {
>-    int		sts;
>-    sts = __pmLogRead(lcp, mode, peekf, result, PMLOGREAD_TO_EOF);
>-    return sts;
>+    return __pmLogRead(lcp, mode, peekf, result, PMLOGREAD_TO_EOF);
> }
> 
> /*
>@@ -1460,7 +1458,7 @@ again:
>      *  Decode
>      *  <----  __pmPDUHdr  ----------->
>      *  :---------:---------:---------:---------------- .........:
>-     *  |   ???   |   ???   |   ???   | timestamp, .... pmResult |
>+     *  | length  | pdutype |  anon   | timestamp, .... pmResult |
>      *  :---------:---------:---------:---------------- .........:
>      *  ^
>      *  |
>@@ -1516,6 +1514,10 @@ again:
> 	return PM_ERR_LOGREC;
>     }
>     else {
>+	__pmPDUHdr *header = (__pmPDUHdr *)pb;
>+	header->len = sizeof(*header) + rlen;
>+	header->type = PDU_RESULT;
>+	header->from = FROM_ANON;
> 	/* swab pdu buffer - done later in __pmDecodeResult */
>     }
>

Actions: View | Diff

Attachments on bug 841159: 600963 | 601673 | 602218 | 602222 | 602400