From: Zhang Tao <kontais@zoho.com>
To: agk@redhat.com, snitzer@redhat.com
Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org,
Zhang Tao <zhangtao27@lenovo.com>
Subject: [PATCH] dm table: fix a potential array out of bounds
Date: Wed, 21 Aug 2019 09:33:31 +0800 [thread overview]
Message-ID: <1566351211-13280-1-git-send-email-kontais@zoho.com> (raw)
From: Zhang Tao <zhangtao27@lenovo.com>
allocate num + 1 for target and offset array, n_highs need num + 1
elements, the last element will be used for node lookup in function
dm_table_find_target.
Signed-off-by: Zhang Tao <zhangtao27@lenovo.com>
---
drivers/md/dm-table.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 7b6c3ee..fd7f604 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -160,20 +160,22 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
{
sector_t *n_highs;
struct dm_target *n_targets;
+ unsigned int alloc_num;
/*
* Allocate both the target array and offset array at once.
* Append an empty entry to catch sectors beyond the end of
* the device.
*/
- n_highs = (sector_t *) dm_vcalloc(num + 1, sizeof(struct dm_target) +
+ alloc_num = num + 1;
+ n_highs = (sector_t *) dm_vcalloc(alloc_num, sizeof(struct dm_target) +
sizeof(sector_t));
if (!n_highs)
return -ENOMEM;
- n_targets = (struct dm_target *) (n_highs + num);
+ n_targets = (struct dm_target *) (n_highs + alloc_num);
- memset(n_highs, -1, sizeof(*n_highs) * num);
+ memset(n_highs, -1, sizeof(*n_highs) * alloc_num);
vfree(t->highs);
t->num_allocated = num;
--
1.8.3.1
next reply other threads:[~2019-08-21 1:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 1:33 Zhang Tao [this message]
2019-08-23 11:28 ` [dm-devel] [PATCH] dm table: fix a potential array out of bounds Mikulas Patocka
2019-08-23 13:54 ` [PATCH 1/2] dm table: fix invalid memory accesses with too high sector number Mikulas Patocka
2019-08-23 13:55 ` [PATCH 2/2] dm: make dm_table_find_target return NULL Mikulas Patocka
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=1566351211-13280-1-git-send-email-kontais@zoho.com \
--to=kontais@zoho.com \
--cc=agk@redhat.com \
--cc=dm-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=snitzer@redhat.com \
--cc=zhangtao27@lenovo.com \
/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).