Merge: tracing/trigger: Fix to return error if failed to alloc snapshot

zampierilucas · zampierilucas · commit a586a557ffbf · 2024-07-26T18:17:33.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4634 JIRA: https://issues.redhat.com/browse/RHEL-33284 CVE: CVE-2024-26920 Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Approved-by: Artem Savkov <asavkov@redhat.com> Approved-by: John B. Wyatt IV <jwyatt@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
@@ -1108,8 +1108,10 @@ register_snapshot_trigger(char *glob, struct event_trigger_ops *ops,
 			  struct event_trigger_data *data,
 			  struct trace_event_file *file)
 {
-	if (tracing_alloc_snapshot_instance(file->tr) != 0)
-		return 0;
+	int ret = tracing_alloc_snapshot_instance(file->tr);
+
+	if (ret < 0)
+		return ret;
 
 	return register_trigger(glob, ops, data, file);
 }

Original file line number	Diff line number	Diff line change
`@@ -1108,8 +1108,10 @@ register_snapshot_trigger(char glob, struct event_trigger_ops ops,`
`1108`	`1108`	`struct event_trigger_data *data,`
`1109`	`1109`	`struct trace_event_file *file)`
`1110`	`1110`	`{`
`1111`		`- if (tracing_alloc_snapshot_instance(file->tr) != 0)`
`1112`		`- return 0;`
	`1111`	`+ int ret = tracing_alloc_snapshot_instance(file->tr);`
	`1112`	`+`
	`1113`	`+ if (ret < 0)`
	`1114`	`+ return ret;`
`1113`	`1115`
`1114`	`1116`	`return register_trigger(glob, ops, data, file);`
`1115`	`1117`	`}`