1 files changed, 17 insertions, 7 deletions

diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
index b1257c816310..4f7b32020487 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
@@ -292,36 +292,46 @@ static int intel_pt_get_ip(enum intel_pt_pkt_type type, unsigned int byte,
                            const unsigned char *buf, size_t len,
                            struct intel_pt_pkt *packet)
 {
-        switch (byte >> 5) {
+        int ip_len;
+
+        packet->count = byte >> 5;
+
+        switch (packet->count) {
         case 0:
-                packet->count = 0;
+                ip_len = 0;
                 break;
         case 1:
                 if (len < 3)
                         return INTEL_PT_NEED_MORE_BYTES;
-                packet->count = 2;
+                ip_len = 2;
                 packet->payload = le16_to_cpu(*(uint16_t *)(buf + 1));
                 break;
         case 2:
                 if (len < 5)
                         return INTEL_PT_NEED_MORE_BYTES;
-                packet->count = 4;
+                ip_len = 4;
                 packet->payload = le32_to_cpu(*(uint32_t *)(buf + 1));
                 break;
         case 3:
-        case 6:
+        case 4:
                 if (len < 7)
                         return INTEL_PT_NEED_MORE_BYTES;
-                packet->count = 6;
+                ip_len = 6;
                 memcpy_le64(&packet->payload, buf + 1, 6);
                 break;
+        case 6:
+                if (len < 9)
+                        return INTEL_PT_NEED_MORE_BYTES;
+                ip_len = 8;
+                packet->payload = le64_to_cpu(*(uint64_t *)(buf + 1));
+                break;
         default:
                 return INTEL_PT_BAD_PACKET;
         }
 
         packet->type = type;
 
-        return packet->count + 1;
+        return ip_len + 1;
 }
 
 static int intel_pt_get_mode(const unsigned char *buf, size_t len,