From: Zhen Lei <thunder.leizhen@huawei.com>
To: "Darrick J . Wong" <darrick.wong@oracle.com>,
Brian Foster <bfoster@redhat.com>,
linux-xfs <linux-xfs@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Subject: [PATCH 1/2] xfs: check the return value of krealloc()
Date: Tue, 24 Nov 2020 18:45:30 +0800 [thread overview]
Message-ID: <20201124104531.561-2-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20201124104531.561-1-thunder.leizhen@huawei.com>
krealloc() may fail to expand the memory space. Add sanity checks to it,
and WARN() if that really happened.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
fs/xfs/libxfs/xfs_inode_fork.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index 7575de5cecb1..4e457aea8493 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -366,6 +366,8 @@ xfs_iroot_realloc(
ifp = XFS_IFORK_PTR(ip, whichfork);
if (rec_diff > 0) {
+ struct xfs_btree_block *if_broot;
+
/*
* If there wasn't any memory allocated before, just
* allocate it now and get out.
@@ -386,8 +388,13 @@ xfs_iroot_realloc(
cur_max = xfs_bmbt_maxrecs(mp, ifp->if_broot_bytes, 0);
new_max = cur_max + rec_diff;
new_size = XFS_BMAP_BROOT_SPACE_CALC(mp, new_max);
- ifp->if_broot = krealloc(ifp->if_broot, new_size,
- GFP_NOFS | __GFP_NOFAIL);
+ if_broot = krealloc(ifp->if_broot, new_size,
+ GFP_NOFS | __GFP_NOFAIL);
+ if (!if_broot) {
+ WARN(1, "if_broot realloc failed\n");
+ return;
+ }
+ ifp->if_broot = if_broot;
op = (char *)XFS_BMAP_BROOT_PTR_ADDR(mp, ifp->if_broot, 1,
ifp->if_broot_bytes);
np = (char *)XFS_BMAP_BROOT_PTR_ADDR(mp, ifp->if_broot, 1,
@@ -477,6 +484,7 @@ xfs_idata_realloc(
{
struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);
int64_t new_size = ifp->if_bytes + byte_diff;
+ char *if_data;
ASSERT(new_size >= 0);
ASSERT(new_size <= XFS_IFORK_SIZE(ip, whichfork));
@@ -496,8 +504,13 @@ xfs_idata_realloc(
* in size so that it can be logged and stay on word boundaries.
* We enforce that here.
*/
- ifp->if_u1.if_data = krealloc(ifp->if_u1.if_data, roundup(new_size, 4),
+ if_data = krealloc(ifp->if_u1.if_data, roundup(new_size, 4),
GFP_NOFS | __GFP_NOFAIL);
+ if (!if_data) {
+ WARN(1, "if_data realloc failed\n");
+ return;
+ }
+ ifp->if_u1.if_data = if_data;
ifp->if_bytes = new_size;
}
--
2.26.0.106.g9fadedd
next prev parent reply other threads:[~2020-11-24 10:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 10:45 [PATCH 0/2] xfs: check krealloc() return value and simplify code Zhen Lei
2020-11-24 10:45 ` Zhen Lei [this message]
2020-11-24 11:51 ` [PATCH 1/2] xfs: check the return value of krealloc() Christoph Hellwig
2020-11-24 12:05 ` Leizhen (ThunderTown)
2020-11-24 10:45 ` [PATCH 2/2] xfs: remove the extra processing of zero size in xfs_idata_realloc() Zhen Lei
2020-11-24 11:52 ` Christoph Hellwig
2020-11-24 12:05 ` Leizhen (ThunderTown)
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=20201124104531.561-2-thunder.leizhen@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=bfoster@redhat.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 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).