Commit 46bc78c8 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

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: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230816105530.3335-3-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4d13ff3

drivers/tty/tty_buffer.c

+1 −2
Original line number Diff line number Diff line
@@ -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;