All of lore.kernel.org
 help / color / mirror / Atom feed
From: Qinglang Miao <miaoqinglang@huawei.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>, <linux-xfs@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, Qinglang Miao <miaoqinglang@huawei.com>
Subject: [PATCH] xfs: check the return value of krealloc() in xfs_uuid_mount
Date: Wed, 25 Nov 2020 14:50:36 +0800	[thread overview]
Message-ID: <20201125065036.154312-1-miaoqinglang@huawei.com> (raw)

krealloc() may fail to expand the memory space. Add sanity checks to it,
and WARN() if that really happened.

Fixes: 771915c4f688 ("xfs: remove kmem_realloc()")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
---
 fs/xfs/xfs_mount.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 150ee5cb8..c07f48c32 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -80,9 +80,13 @@ xfs_uuid_mount(
 	}
 
 	if (hole < 0) {
-		xfs_uuid_table = krealloc(xfs_uuid_table,
+		uuid_t *if_xfs_uuid_table;
+		if_xfs_uuid_table = krealloc(xfs_uuid_table,
 			(xfs_uuid_table_size + 1) * sizeof(*xfs_uuid_table),
 			GFP_KERNEL | __GFP_NOFAIL);
+		if (!if_xfs_uuid_table)
+			goto out_duplicate;
+		xfs_uuid_table = if_xfs_uuid_table;
 		hole = xfs_uuid_table_size++;
 	}
 	xfs_uuid_table[hole] = *uuid;
-- 
2.23.0


             reply	other threads:[~2020-11-25  6:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-25  6:50 Qinglang Miao [this message]
2020-11-25 15:55 ` [PATCH] xfs: check the return value of krealloc() in xfs_uuid_mount Eric Sandeen
2020-11-26  1:21   ` Qinglang Miao
2020-11-26  2:16     ` Gao Xiang
2020-11-26  3:05       ` Qinglang Miao
2020-11-26  3:13         ` Gao Xiang

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=20201125065036.154312-1-miaoqinglang@huawei.com \
    --to=miaoqinglang@huawei.com \
    --cc=darrick.wong@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-xfs@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.