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

tty: switch count in tty_ldisc_receive_buf() to size_t 



It comes from both paste_selection() and tty_port_default_receive_buf()
as unsigned (int and size_t respectively). Switch to size_t to converge
to that eventually.

Return the count as size_t too (the two callers above expect that).

Switch paste_selection()'s type of 'count' too, so that the returned and
passed type match.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-13-jirislaby@kernel.org


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

drivers/tty/tty_buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -450,13 +450,13 @@ EXPORT_SYMBOL_GPL(tty_prepare_flip_string); 
 *

 * Returns: the number of bytes processed.

 */

int tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,

			  const char *f, int count)

size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,

			     const char *f, size_t count)

{

	if (ld->ops->receive_buf2)

		count = ld->ops->receive_buf2(ld->tty, p, f, count);

	else {

		count = min_t(int, count, ld->tty->receive_room);

		count = min_t(size_t, count, ld->tty->receive_room);

		if (count && ld->ops->receive_buf)

			ld->ops->receive_buf(ld->tty, p, f, count);

	}

drivers/tty/vt/selection.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ int paste_selection(struct tty_struct *tty) 
{

	struct vc_data *vc = tty->driver_data;

	int	pasted = 0;

	unsigned int count;

	size_t count;

	struct  tty_ldisc *ld;

	DECLARE_WAITQUEUE(wait, current);

	int ret = 0;

include/linux/tty_flip.h

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ static inline int tty_insert_flip_string(struct tty_port *port, 
	return tty_insert_flip_string_fixed_flag(port, chars, TTY_NORMAL, size);

}



int tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,

		const char *f, int count);

size_t tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,

			     const char *f, size_t count);



void tty_buffer_lock_exclusive(struct tty_port *port);

void tty_buffer_unlock_exclusive(struct tty_port *port);