linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] uprobes: add missing get_uprobe() in __find_uprobe()
@ 2021-02-09 15:07 Sven Schnelle
  2021-02-09 15:43 ` Peter Zijlstra
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Sven Schnelle @ 2021-02-09 15:07 UTC (permalink / raw)
  To: Peter Zijlstra; +Cc: linux-kernel, linux-next, Sven Schnelle

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

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
---
 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] uprobes: add missing get_uprobe() in __find_uprobe()
  2021-02-09 15:07 [PATCH] uprobes: add missing get_uprobe() in __find_uprobe() Sven Schnelle
@ 2021-02-09 15:43 ` Peter Zijlstra
  2021-02-10 13:53 ` [tip: sched/core] uprobes: (Re)add " tip-bot2 for Sven Schnelle
  2021-02-17 13:17 ` tip-bot2 for Sven Schnelle
  2 siblings, 0 replies; 4+ messages in thread
From: Peter Zijlstra @ 2021-02-09 15:43 UTC (permalink / raw)
  To: Sven Schnelle; +Cc: linux-kernel, linux-next

On Tue, Feb 09, 2021 at 04:07:11PM +0100, Sven Schnelle wrote:
> commit c6bc9bd06dff49fa4c("rbtree, uprobes: Use rbtree helpers") from
> next-20210208 accidentally removed the refcount increase. Add it again.
> 

Thanks, and sorry about that!

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [tip: sched/core] uprobes: (Re)add missing get_uprobe() in __find_uprobe()
  2021-02-09 15:07 [PATCH] uprobes: add missing get_uprobe() in __find_uprobe() Sven Schnelle
  2021-02-09 15:43 ` Peter Zijlstra
@ 2021-02-10 13:53 ` tip-bot2 for Sven Schnelle
  2021-02-17 13:17 ` tip-bot2 for Sven Schnelle
  2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Sven Schnelle @ 2021-02-10 13:53 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Sven Schnelle, Peter Zijlstra (Intel), x86, linux-kernel

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 <svens@linux.ibm.com>
AuthorDate:    Tue, 09 Feb 2021 16:07:11 +01:00
Committer:     Peter Zijlstra <peterz@infradead.org>
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 <svens@linux.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210209150711.36778-1-svens@linux.ibm.com
---
 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;
 }

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [tip: sched/core] uprobes: (Re)add missing get_uprobe() in __find_uprobe()
  2021-02-09 15:07 [PATCH] uprobes: add missing get_uprobe() in __find_uprobe() Sven Schnelle
  2021-02-09 15:43 ` Peter Zijlstra
  2021-02-10 13:53 ` [tip: sched/core] uprobes: (Re)add " tip-bot2 for Sven Schnelle
@ 2021-02-17 13:17 ` tip-bot2 for Sven Schnelle
  2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Sven Schnelle @ 2021-02-17 13:17 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Sven Schnelle, Peter Zijlstra (Intel), Ingo Molnar, x86, linux-kernel

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 <svens@linux.ibm.com>
AuthorDate:    Tue, 09 Feb 2021 16:07:11 +01:00
Committer:     Ingo Molnar <mingo@kernel.org>
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 <svens@linux.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20210209150711.36778-1-svens@linux.ibm.com
---
 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;
 }

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-17 13:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-09 15:07 [PATCH] uprobes: add missing get_uprobe() in __find_uprobe() Sven Schnelle
2021-02-09 15:43 ` Peter Zijlstra
2021-02-10 13:53 ` [tip: sched/core] uprobes: (Re)add " tip-bot2 for Sven Schnelle
2021-02-17 13:17 ` tip-bot2 for Sven Schnelle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).