diff options
| author |   James Morris <james.morris@microsoft.com> | 2018-06-25 09:20:40 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-06-25 09:20:40 -0700 |
| commit | 57b54d74dd5c559bd35f2affaf11d8828aaf5733 (patch) | |
| tree | 025d99f0d6b298fbdbf3ce942ec7868131444090 /lib/interval_tree_test.c | |
| parent | MAINTAINERS: remove the outdated "LINUX SECURITY MODULE (LSM) FRAMEWORK" entry (diff) | |
| parent | Linux 4.18-rc2 (diff) | |
| download | wireguard-linux-57b54d74dd5c559bd35f2affaf11d8828aaf5733.tar.xz wireguard-linux-57b54d74dd5c559bd35f2affaf11d8828aaf5733.zip | |
Merge tag 'v4.18-rc2' into next-general
Merge to Linux 4.18-rc2 for security subsystem developers.
Diffstat (limited to 'lib/interval_tree_test.c')
| -rw-r--r-- | lib/interval_tree_test.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/interval_tree_test.c b/lib/interval_tree_test.c index 835242e74aaa..75509a1511a3 100644 --- a/lib/interval_tree_test.c +++ b/lib/interval_tree_test.c @@ -64,11 +64,12 @@ static int interval_tree_test_init(void) unsigned long results; cycles_t time1, time2, time; - nodes = kmalloc(nnodes * sizeof(struct interval_tree_node), GFP_KERNEL); + nodes = kmalloc_array(nnodes, sizeof(struct interval_tree_node), + GFP_KERNEL); if (!nodes) return -ENOMEM; - queries = kmalloc(nsearches * sizeof(int), GFP_KERNEL); + queries = kmalloc_array(nsearches, sizeof(int), GFP_KERNEL); if (!queries) { kfree(nodes); return -ENOMEM; |