2021-02-10 05:36:11

by Sven Schnelle

Subject: [PATCH] uprobes: add missing get_uprobe() in __find_uprobe()

commit c6bc9bd06dff49fa4c("rbtree, uprobes: Use rbtree helpers") from
next-20210208 accidentally removed the refcount increase. Add it again.

Signed-off-by: Sven Schnelle <[email protected]>
---
kernel/events/uprobes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 7e15b2efdd87..6addc9780319 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -661,7 +661,7 @@ static struct uprobe *__find_uprobe(struct inode *inode, loff_t offset)
struct rb_node *node = rb_find(&key, &uprobes_tree, __uprobe_cmp_key);

if (node)
- return __node_2_uprobe(node);
+ return get_uprobe(__node_2_uprobe(node));

return NULL;
}
--
2.17.1

2021-02-10 14:00:56

by tip-bot2 for Alexey Makhalov

Subject: [tip: sched/core] uprobes: (Re)add missing get_uprobe() in __find_uprobe()

The following commit has been merged into the sched/core branch of tip:

Commit-ID: 2c3496a02cb06ffe957854d8488a5799d7bfb252
Gitweb: https://git.kernel.org/tip/2c3496a02cb06ffe957854d8488a5799d7bfb252
Author: Sven Schnelle <[email protected]>
AuthorDate: Tue, 09 Feb 2021 16:07:11 +01:00
Committer: Peter Zijlstra <[email protected]>
CommitterDate: Wed, 10 Feb 2021 14:44:48 +01:00

uprobes: (Re)add missing get_uprobe() in __find_uprobe()

commit c6bc9bd06dff ("rbtree, uprobes: Use rbtree helpers")
accidentally removed the refcount increase. Add it again.

Fixes: c6bc9bd06dff ("rbtree, uprobes: Use rbtree helpers")
Signed-off-by: Sven Schnelle <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
kernel/events/uprobes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index fd5160d..3ea7f8f 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -661,7 +661,7 @@ static struct uprobe *__find_uprobe(struct inode *inode, loff_t offset)
struct rb_node *node = rb_find(&key, &uprobes_tree, __uprobe_cmp_key);

if (node)
- return __node_2_uprobe(node);
+ return get_uprobe(__node_2_uprobe(node));

return NULL;
}

2021-02-17 13:40:05

by tip-bot2 for Alexey Makhalov

Subject: [tip: sched/core] uprobes: (Re)add missing get_uprobe() in __find_uprobe()

The following commit has been merged into the sched/core branch of tip:

Commit-ID: b0d6d4789677d128b1933af023083054f0973574
Gitweb: https://git.kernel.org/tip/b0d6d4789677d128b1933af023083054f0973574
Author: Sven Schnelle <[email protected]>
AuthorDate: Tue, 09 Feb 2021 16:07:11 +01:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Wed, 17 Feb 2021 14:12:42 +01:00

uprobes: (Re)add missing get_uprobe() in __find_uprobe()

commit c6bc9bd06dff ("rbtree, uprobes: Use rbtree helpers")
accidentally removed the refcount increase. Add it again.

Fixes: c6bc9bd06dff ("rbtree, uprobes: Use rbtree helpers")
Signed-off-by: Sven Schnelle <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
kernel/events/uprobes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index fd5160d..3ea7f8f 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -661,7 +661,7 @@ static struct uprobe *__find_uprobe(struct inode *inode, loff_t offset)
struct rb_node *node = rb_find(&key, &uprobes_tree, __uprobe_cmp_key);

if (node)
- return __node_2_uprobe(node);
+ return get_uprobe(__node_2_uprobe(node));

return NULL;
}