Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6261242 authored by Anthony Mallet's avatar Anthony Mallet Committed by Greg Kroah-Hartman
Browse files

USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL 



[ Upstream commit 633e2b2ded739a34bd0fb1d8b5b871f7e489ea29 ]

close_delay and closing_wait are specified in hundredth of a second but stored
internally in jiffies. Use the jiffies_to_msecs() and msecs_to_jiffies()
functions to convert from each other.

Signed-off-by: default avatarAnthony Mallet <anthony.mallet@laas.fr>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200312133101.7096-1-anthony.mallet@laas.fr


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6c1051ff

drivers/usb/class/cdc-acm.c

+5 −4
Original line number Diff line number Diff line
@@ -914,10 +914,10 @@ static int get_serial_info(struct acm *acm, struct serial_struct __user *info) 
	memset(&tmp, 0, sizeof(tmp));

	tmp.xmit_fifo_size = acm->writesize;

	tmp.baud_base = le32_to_cpu(acm->line.dwDTERate);

	tmp.close_delay	= acm->port.close_delay / 10;

	tmp.close_delay	= jiffies_to_msecs(acm->port.close_delay) / 10;

	tmp.closing_wait = acm->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ?

				ASYNC_CLOSING_WAIT_NONE :

				acm->port.closing_wait / 10;

				jiffies_to_msecs(acm->port.closing_wait) / 10;



	if (copy_to_user(info, &tmp, sizeof(tmp)))

		return -EFAULT;
@@ -935,9 +935,10 @@ static int set_serial_info(struct acm *acm, 
	if (copy_from_user(&new_serial, newinfo, sizeof(new_serial)))

		return -EFAULT;



	close_delay = new_serial.close_delay * 10;

	close_delay = msecs_to_jiffies(new_serial.close_delay * 10);

	closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ?

			ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;

			ASYNC_CLOSING_WAIT_NONE :

			msecs_to_jiffies(new_serial.closing_wait * 10);



	mutex_lock(&acm->port.mutex);