diff --git a/src/msgbuf.h b/src/msgbuf.h
index a176891..63cd827 100644
--- a/src/msgbuf.h
+++ b/src/msgbuf.h
@@ -1130,6 +1130,50 @@
 	return 0;
 }
 
+LIBPLDM_CC_NONNULL
+LIBPLDM_CC_ALWAYS_INLINE int
+pldm_msgbuf_peek_remaining(struct pldm_msgbuf *ctx, void **cursor, size_t *len)
+{
+	if (!ctx->cursor || *cursor) {
+		return -EINVAL;
+	}
+
+	if (ctx->remaining < 0) {
+		return -EOVERFLOW;
+	}
+
+	*cursor = ctx->cursor;
+	*len = ctx->remaining;
+
+	return 0;
+}
+
+LIBPLDM_CC_NONNULL
+LIBPLDM_CC_ALWAYS_INLINE int pldm_msgbuf_skip(struct pldm_msgbuf *ctx,
+					      size_t count)
+{
+	if (!ctx->cursor) {
+		return -EINVAL;
+	}
+
+#if INTMAX_MAX < SIZE_MAX
+	if (count > INTMAX_MAX) {
+		return -EOVERFLOW;
+	}
+#endif
+
+	if (ctx->remaining < INTMAX_MIN + (intmax_t)count) {
+		return -EOVERFLOW;
+	}
+	ctx->remaining -= (intmax_t)count;
+	if (ctx->remaining < 0) {
+		return -EOVERFLOW;
+	}
+	ctx->cursor += count;
+
+	return 0;
+}
+
 /**
  * Return the number of bytes used in a msgbuf instance.
  *