unsigned long sb_bindex;
struct lttng_ust_lib_ring_buffer *buf;
struct ustctl_consumer_channel *consumer_chan;
+ struct lttng_ust_lib_ring_buffer_backend_pages_shmp *barray_idx;
+ struct lttng_ust_lib_ring_buffer_backend_pages *pages;
if (!stream)
return -EINVAL;
return -EINVAL;
sb_bindex = subbuffer_id_get_index(&chan->backend.config,
buf->backend.buf_rsb.id);
- *off = shmp(consumer_chan->chan->handle,
- shmp_index(consumer_chan->chan->handle, buf->backend.array, sb_bindex)->shmp)->mmap_offset;
+ barray_idx = shmp_index(consumer_chan->chan->handle, buf->backend.array,
+ sb_bindex);
+ if (!barray_idx)
+ return -EINVAL;
+ pages = shmp(consumer_chan->chan->handle, barray_idx->shmp);
+ if (!pages)
+ return -EINVAL;
+ *off = pages->mmap_offset;
return 0;
}
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
chan = shmp(handle, buf->backend.chan);
+ if (!chan)
+ return NULL;
config = &chan->backend.config;
if (!config->cb_ptr)
return NULL;
return -LTTNG_UST_ERR_UNSUP_MAJOR;
}
+ /*
+ * Addition of enumeration inside _ustclt_basic_type should have been
+ * marked as a breaking ABI change since it blows past the included
+ * padding hence result in bigger than expected struct. Refuse
+ * registration for non-matching minor version since only two minor
+ * versions exist for ust-2.7(6.0) and 2.8(6.1).
+ */
+ if (reg_msg.minor != LTTNG_UST_ABI_MINOR_VERSION) {
+ return -LTTNG_UST_ERR_UNSUP_MAJOR;
+ }
+
return 0;
}