* [PATCH] kernfs: fix potential null pointer dereference
@ 2019-07-05 13:47 Peng Wang
2019-07-08 14:37 ` Tejun Heo
0 siblings, 1 reply; 2+ messages in thread
From: Peng Wang @ 2019-07-05 13:47 UTC (permalink / raw)
To: gregkh, tj; +Cc: linux-kernel, Peng Wang
Get root safely after kn is ensureed to be not null.
Signed-off-by: Peng Wang <rocking@whu.edu.cn>
---
fs/kernfs/dir.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index a387534c9577..ea3fc972c48b 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -430,7 +430,7 @@ struct kernfs_node *kernfs_get_active(struct kernfs_node *kn)
*/
void kernfs_put_active(struct kernfs_node *kn)
{
- struct kernfs_root *root = kernfs_root(kn);
+ struct kernfs_root *root;
int v;
if (unlikely(!kn))
@@ -442,6 +442,7 @@ void kernfs_put_active(struct kernfs_node *kn)
if (likely(v != KN_DEACTIVATED_BIAS))
return;
+ root = kernfs_root(kn);
wake_up_all(&root->deactivate_waitq);
}
--
2.19.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] kernfs: fix potential null pointer dereference
2019-07-05 13:47 [PATCH] kernfs: fix potential null pointer dereference Peng Wang
@ 2019-07-08 14:37 ` Tejun Heo
0 siblings, 0 replies; 2+ messages in thread
From: Tejun Heo @ 2019-07-08 14:37 UTC (permalink / raw)
To: Peng Wang; +Cc: gregkh, linux-kernel
On Fri, Jul 05, 2019 at 09:47:30PM +0800, Peng Wang wrote:
> diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
> index a387534c9577..ea3fc972c48b 100644
> --- a/fs/kernfs/dir.c
> +++ b/fs/kernfs/dir.c
> @@ -430,7 +430,7 @@ struct kernfs_node *kernfs_get_active(struct kernfs_node *kn)
> */
> void kernfs_put_active(struct kernfs_node *kn)
> {
> - struct kernfs_root *root = kernfs_root(kn);
> + struct kernfs_root *root;
> int v;
>
> if (unlikely(!kn))
> @@ -442,6 +442,7 @@ void kernfs_put_active(struct kernfs_node *kn)
> if (likely(v != KN_DEACTIVATED_BIAS))
> return;
>
> + root = kernfs_root(kn);
> wake_up_all(&root->deactivate_waitq);
Maybe just remove the root variable altogether? Other than that,
Acked-by: Tejun Heo <tj@kernel.org>
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-08 14:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-05 13:47 [PATCH] kernfs: fix potential null pointer dereference Peng Wang
2019-07-08 14:37 ` Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome