]> git.baikalelectronics.ru Git - kernel.git/commitdiff
relay: fix type mismatch when allocating memory in relay_create_buf()
authorGavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
Tue, 29 Nov 2022 09:23:38 +0000 (09:23 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 10:40:58 +0000 (11:40 +0100)
[ Upstream commit 4d8586e04602fe42f0a782d2005956f8b6302678 ]

The 'padding' field of the 'rchan_buf' structure is an array of 'size_t'
elements, but the memory is allocated for an array of 'size_t *' elements.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Link: https://lkml.kernel.org/r/20221129092002.3538384-1-Ilia.Gavrilov@infotecs.ru
Fixes: 48b6ca91ae3f ("[PATCH] relay: migrate from relayfs to a generic relay API")
Signed-off-by: Ilia.Gavrilov <Ilia.Gavrilov@infotecs.ru>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: wuchi <wuchi.zero@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/relay.c

index d3940becf2fc326d168c6025d3befcf305da050a..9b1cfcd8dc6b1402fa521766ef7c04674c175d97 100644 (file)
@@ -163,13 +163,13 @@ static struct rchan_buf *relay_create_buf(struct rchan *chan)
 {
        struct rchan_buf *buf;
 
-       if (chan->n_subbufs > KMALLOC_MAX_SIZE / sizeof(size_t *))
+       if (chan->n_subbufs > KMALLOC_MAX_SIZE / sizeof(size_t))
                return NULL;
 
        buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
        if (!buf)
                return NULL;
-       buf->padding = kmalloc_array(chan->n_subbufs, sizeof(size_t *),
+       buf->padding = kmalloc_array(chan->n_subbufs, sizeof(size_t),
                                     GFP_KERNEL);
        if (!buf->padding)
                goto free_buf;