From: Colin King <colin.king@canonical.com>
To: "Darrick J . Wong" <darrick.wong@oracle.com>,
linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] xfs: do not call xfs_buf_hash_destroy on a NULL pag
Date: Fri, 20 Jan 2017 14:26:42 +0000 [thread overview]
Message-ID: <20170120142642.21698-1-colin.king@canonical.com> (raw)
From: Colin Ian King <colin.king@canonical.com>
If pag cannot be allocated, the current error exit path will trip
a null pointer deference error when calling xfs_buf_hash_destroy
with a null pag. Fix this by adding a new error exit lable and
jumping to this, avoiding the hash destroy and unnecessary kmem_free
on pag.
Fixes CoverityScan CID#1397628 ("Dereference after null check")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
fs/xfs/xfs_mount.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 9b9540d..4e66cd19 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -207,7 +207,7 @@ xfs_initialize_perag(
pag = kmem_zalloc(sizeof(*pag), KM_MAYFAIL);
if (!pag)
- goto out_unwind;
+ goto out_unwind_pags;
pag->pag_agno = index;
pag->pag_mount = mp;
spin_lock_init(&pag->pag_ici_lock);
@@ -242,6 +242,7 @@ xfs_initialize_perag(
out_unwind:
xfs_buf_hash_destroy(pag);
kmem_free(pag);
+out_unwind_pags:
for (; index > first_initialised; index--) {
pag = radix_tree_delete(&mp->m_perag_tree, index);
xfs_buf_hash_destroy(pag);
--
2.10.2
next reply other threads:[~2017-01-20 14:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 14:26 Colin King [this message]
2017-01-20 16:34 ` [PATCH] xfs: do not call xfs_buf_hash_destroy on a NULL pag Darrick J. Wong
2017-01-20 19:26 ` Eric Sandeen
2017-01-20 20:47 ` Darrick J. Wong
2017-01-20 23:04 ` Colin Ian King
2017-01-24 15:04 ` Bill O'Donnell
2017-01-24 18:34 ` Darrick J. Wong
2017-01-24 21:08 ` [PATCH v2] " Bill O'Donnell
2017-01-24 21:21 ` Darrick J. Wong
2017-01-24 21:28 ` Bill O'Donnell
2017-01-25 19:04 ` [PATCH v3] " Bill O'Donnell
2017-01-26 17:58 ` Eric Sandeen
2017-01-26 18:55 ` Bill O'Donnell
2017-01-26 20:27 ` Eric Sandeen
2017-01-28 19:19 ` [PATCH] xfs: correct null checks and error processing in xfs_initialize_perag Bill O'Donnell
2017-02-03 22:57 ` Eric Sandeen
2017-02-06 17:08 ` [PATCH v2] " Bill O'Donnell
2017-02-06 19:25 ` Darrick J. Wong
2017-02-07 16:54 ` [PATCH v3] " Bill O'Donnell
2017-02-07 20:49 ` Eric Sandeen
2017-02-07 20:59 ` Darrick J. Wong
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=20170120142642.21698-1-colin.king@canonical.com \
--to=colin.king@canonical.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).