From: Janosch Frank <frankja@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: thuth@redhat.com, david@redhat.com, pbonzini@redhat.com
Subject: [kvm-unit-tests PATCH v2] alloc: Add memalign error checks
Date: Mon, 4 Nov 2019 05:29:16 -0500 [thread overview]
Message-ID: <20191104102916.10554-1-frankja@linux.ibm.com> (raw)
Let's test for size and alignment in memalign to catch invalid input
data. Also we need to test for NULL after calling the memalign
function of the registered alloc operations.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
lib/alloc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/alloc.c b/lib/alloc.c
index ecdbbc4..b763c70 100644
--- a/lib/alloc.c
+++ b/lib/alloc.c
@@ -47,6 +47,8 @@ void *memalign(size_t alignment, size_t size)
uintptr_t mem;
assert(alloc_ops && alloc_ops->memalign);
+ if (!size || !alignment)
+ return NULL;
if (alignment <= sizeof(uintptr_t))
alignment = sizeof(uintptr_t);
else
@@ -55,6 +57,7 @@ void *memalign(size_t alignment, size_t size)
blkalign = MAX(alignment, alloc_ops->align_min);
size = ALIGN(size + METADATA_EXTRA, alloc_ops->align_min);
p = alloc_ops->memalign(blkalign, size);
+ assert(p);
/* Leave room for metadata before aligning the result. */
mem = (uintptr_t)p + METADATA_EXTRA;
--
2.20.1
next reply other threads:[~2019-11-04 10:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 10:29 Janosch Frank [this message]
2019-11-04 10:33 ` [kvm-unit-tests PATCH v2] alloc: Add memalign error checks David Hildenbrand
2019-11-04 10:54 ` Andrew Jones
2019-11-04 11:29 ` Paolo Bonzini
2019-11-04 11:31 ` David Hildenbrand
2019-11-11 10:12 ` Janosch Frank
2019-11-11 12:31 ` Andrew Jones
2019-11-11 13:04 ` Paolo Bonzini
2019-11-11 13:13 ` Janosch Frank
2019-11-11 13:17 ` Paolo Bonzini
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=20191104102916.10554-1-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=david@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.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