linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Defang Bo <bodefang@126.com>
To: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com
Cc: linux-btrfs@vger.kernel.or, linux-kernel@vger.kernel.org,
	Defang Bo <bodefang@126.com>
Subject: [PATCH v3] fs/btrfs: avoid null pointer dereference if reloc control has not been initialized
Date: Tue,  5 Jan 2021 21:22:58 +0800	[thread overview]
Message-ID: <1609852978-2463334-1-git-send-email-bodefang@126.com> (raw)

Similar to commmit<389305b2aa68>("btrfs: relocation: Only remove reloc rb_trees if
reloc control has been initialized"). It turns out that fs_info::reloc_ctl can be NULL
in btrfs_recover_relocation(), as we allocate relocation control after all reloc roots
have been verified,so there should be a check for rc to prevent null pointer dereference.

......
Signed-off-by: Defang Bo <bodefang@126.com>
---
Changes since v2:
- Resend this patch with manual reformatted.

Changes singe v1:
- More accurate description for this patch to describe how the NULL can get there.
---
......
---
 fs/btrfs/relocation.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 3602806d71bd..ca035712e08b 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -626,6 +626,9 @@ static int __must_check __add_reloc_root(struct btrfs_root *root)
 	struct mapping_node *node;
 	struct reloc_control *rc = fs_info->reloc_ctl;
 
+	if (!rc)
+		return 0;
+
 	node = kmalloc(sizeof(*node), GFP_NOFS);
 	if (!node)
 		return -ENOMEM;
@@ -703,6 +706,9 @@ static int __update_reloc_root(struct btrfs_root *root)
 	struct rb_node *rb_node;
 	struct mapping_node *node = NULL;
 	struct reloc_control *rc = fs_info->reloc_ctl;
+
+	if (!rc)
+		return 0;
 
 	spin_lock(&rc->reloc_root_tree.lock);
 	rb_node = rb_simple_search(&rc->reloc_root_tree.rb_root,
-- 
2.7.4


                 reply	other threads:[~2021-01-05 13:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1609852978-2463334-1-git-send-email-bodefang@126.com \
    --to=bodefang@126.com \
    --cc=clm@fb.com \
    --cc=dsterba@suse.com \
    --cc=josef@toxicpanda.com \
    --cc=linux-btrfs@vger.kernel.or \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).