X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-abi.c;h=59fea6266a840fd53e568c6526f12a60ccb72333;hb=c02d67bcbfbbbd0d82b338da1eddfec015a96b8a;hp=1f0939815262e5e2209d6c3e208a1c113c4b3acc;hpb=1bbb5b2dfb4634c1ed19d006a538101fd69a30de;p=lttng-modules.git

diff --git a/src/lttng-abi.c b/src/lttng-abi.c
index 1f093981..59fea626 100644
--- a/src/lttng-abi.c
+++ b/src/lttng-abi.c
@@ -650,6 +650,8 @@ long lttng_counter_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (validate_zeroed_padding(local_counter_read.padding,
 				sizeof(local_counter_read.padding)))
 			return -EINVAL;
+		if (local_counter_read.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX)
+			return -EINVAL;
 
 		/* Cast all indexes into size_t. */
 		for (i = 0; i < local_counter_read.index.number_dimensions; i++)
@@ -685,6 +687,8 @@ long lttng_counter_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (validate_zeroed_padding(local_counter_aggregate.padding,
 				sizeof(local_counter_aggregate.padding)))
 			return -EINVAL;
+		if (local_counter_aggregate.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX)
+			return -EINVAL;
 
 		/* Cast all indexes into size_t. */
 		for (i = 0; i < local_counter_aggregate.index.number_dimensions; i++)
@@ -716,6 +720,8 @@ long lttng_counter_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (validate_zeroed_padding(local_counter_clear.padding,
 				sizeof(local_counter_clear.padding)))
 			return -EINVAL;
+		if (local_counter_clear.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX)
+			return -EINVAL;
 
 		/* Cast all indexes into size_t. */
 		for (i = 0; i < local_counter_clear.index.number_dimensions; i++)
@@ -724,7 +730,6 @@ long lttng_counter_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return lttng_kernel_counter_clear(counter, indexes);
 	}
 	default:
-		WARN_ON_ONCE(1);
 		return -ENOSYS;
 	}
 }
@@ -1011,7 +1016,7 @@ ssize_t lttng_event_notifier_group_notif_read(struct file *filp, char __user *us
 
 	/* Finish copy of previous record */
 	if (*ppos != 0) {
-		if (read_count < count) {
+		if (count != 0) {
 			len = chan->iter.len_left;
 			read_offset = *ppos;
 			goto skip_get_next;
@@ -1091,7 +1096,8 @@ nodata:
 	chan->iter.len_left = 0;
 
 put_record:
-	lib_ring_buffer_put_current_record(buf);
+	if (*ppos == 0)
+		lib_ring_buffer_put_current_record(buf);
 	return read_count;
 }
 
@@ -1912,7 +1918,7 @@ int lttng_abi_create_event(struct file *channel_file,
 		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_UPROBE:
 	{
-		struct lttng_kernel_event_recorder *event;
+		struct lttng_kernel_event_common *event;
 		struct lttng_event_recorder_enabler *event_enabler;
 
 		event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
@@ -1925,14 +1931,14 @@ int lttng_abi_create_event(struct file *channel_file,
 		 * We tolerate no failure path after event creation. It
 		 * will stay invariant for the rest of the session.
 		 */
-		event = lttng_kernel_event_recorder_create(event_enabler, NULL);
-		WARN_ON_ONCE(!event);
+		event = lttng_kernel_event_create(&event_enabler->parent, NULL);
+		WARN_ON_ONCE(IS_ERR(event));
 		lttng_event_enabler_destroy(&event_enabler->parent);
 		if (IS_ERR(event)) {
 			ret = PTR_ERR(event);
 			goto event_error;
 		}
-		priv = event;
+		priv = container_of(event, struct lttng_kernel_event_recorder, parent);
 		break;
 	}
 
@@ -2153,7 +2159,7 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file,
 		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_UPROBE:
 	{
-		struct lttng_kernel_event_notifier *event_notifier;
+		struct lttng_kernel_event_common *event;
 		struct lttng_event_notifier_enabler *event_notifier_enabler;
 
 		event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
@@ -2162,14 +2168,14 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file,
 			ret = -ENOMEM;
 			goto event_notifier_error;
 		}
-		event_notifier = lttng_event_notifier_create(event_notifier_enabler, NULL);
-		WARN_ON_ONCE(!event_notifier);
+		event = lttng_kernel_event_create(&event_notifier_enabler->parent, NULL);
+		WARN_ON_ONCE(IS_ERR(event));
 		lttng_event_enabler_destroy(&event_notifier_enabler->parent);
-		if (IS_ERR(event_notifier)) {
-			ret = PTR_ERR(event_notifier);
+		if (IS_ERR(event)) {
+			ret = PTR_ERR(event);
 			goto event_notifier_error;
 		}
-		priv = event_notifier;
+		priv = container_of(event, struct lttng_kernel_event_notifier, parent);
 		break;
 	}