[GIT PULL] probes: Fixes for v6.17-rc7

[Masami Hiramatsu (Google) <mhiramat@kernel.org>]

Hi Linus,

Probes fixes for v6.17-rc7

- fprobe: Even if there is a memory allocation failure, try to remove
  the addresses recorded until then from the filter. Previously we
  just skip it.
- tracing: dynevent: Add a missing lockdown check on dynevent. This
  dynevent is the interface for all probe events. Thus if there is no
  check, any probe events can be added after lock down the tracefs.


Please pull the latest probes-fixes-v6.17-rc7 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
probes-fixes-v6.17-rc7

Tag SHA1: 23003eb204ceabd753f1a937e2a34b3ed82809fc
Head SHA1: 456c32e3c4316654f95f9d49c12cbecfb77d5660


Masami Hiramatsu (Google) (2):
      tracing: fprobe: Fix to remove recorded module addresses from filter
      tracing: dynevent: Add a missing lockdown check on dynevent

----
 kernel/trace/fprobe.c         | 7 ++++---
 kernel/trace/trace_dynevent.c | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)
---------------------------
diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c
index c8034dfc1070..5a807d62e76d 100644
--- a/kernel/trace/fprobe.c
+++ b/kernel/trace/fprobe.c
@@ -428,8 +428,9 @@ static int fprobe_addr_list_add(struct fprobe_addr_list *alist, unsigned long ad
 {
 	unsigned long *addrs;
 
-	if (alist->index >= alist->size)
-		return -ENOMEM;
+	/* Previously we failed to expand the list. */
+	if (alist->index == alist->size)
+		return -ENOSPC;
 
 	alist->addrs[alist->index++] = addr;
 	if (alist->index < alist->size)
@@ -489,7 +490,7 @@ static int fprobe_module_callback(struct notifier_block *nb,
 	for (i = 0; i < FPROBE_IP_TABLE_SIZE; i++)
 		fprobe_remove_node_in_module(mod, &fprobe_ip_table[i], &alist);
 
-	if (alist.index < alist.size && alist.index > 0)
+	if (alist.index > 0)
 		ftrace_set_filter_ips(&fprobe_graph_ops.ops,
 				      alist.addrs, alist.index, 1, 0);
 	mutex_unlock(&fprobe_mutex);
diff --git a/kernel/trace/trace_dynevent.c b/kernel/trace/trace_dynevent.c
index 5d64a18cacac..d06854bd32b3 100644
--- a/kernel/trace/trace_dynevent.c
+++ b/kernel/trace/trace_dynevent.c
@@ -230,6 +230,10 @@ static int dyn_event_open(struct inode *inode, struct file *file)
 {
 	int ret;
 
+	ret = security_locked_down(LOCKDOWN_TRACEFS);
+	if (ret)
+		return ret;
+
 	ret = tracing_check_open_get_tr(NULL);
 	if (ret)
 		return ret;

-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>