summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorJiri Slaby (SUSE) <jirislaby@kernel.org>2023-08-16 12:55:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-22 14:58:15 +0200
commit46bc78c81b65044fa7bd4781e6501b756b3a86bc (patch)
treed59d32b205b9d97942c692a59e6fa358b137a432 /drivers/tty
parentd4d13ff3ac78b41bfaefd5ad1efd72cfbf43f288 (diff)
downloadlinux-46bc78c81b65044fa7bd4781e6501b756b3a86bc.tar.gz
linux-46bc78c81b65044fa7bd4781e6501b756b3a86bc.tar.bz2
linux-46bc78c81b65044fa7bd4781e6501b756b3a86bc.zip
tty: tty_buffer: use struct_size() in tty_buffer_alloc()
Now, that tty_buffer::data has the right type, use struct_size() for size calculation. struct_size() makes the code less error-prone and more readable. Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org> Link: https://lore.kernel.org/r/20230816105530.3335-3-jirislaby@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/tty_buffer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index 684d099cbe11..c94df1a2d7f8 100644
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -177,8 +177,7 @@ static struct tty_buffer *tty_buffer_alloc(struct tty_port *port, size_t size)
*/
if (atomic_read(&port->buf.mem_used) > port->buf.mem_limit)
return NULL;
- p = kmalloc(sizeof(struct tty_buffer) + 2 * size,
- GFP_ATOMIC | __GFP_NOWARN);
+ p = kmalloc(struct_size(p, data, 2 * size), GFP_ATOMIC | __GFP_NOWARN);
if (p == NULL)
return NULL;