Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp846086pja; Wed, 1 Apr 2020 09:45:02 -0700 (PDT) X-Google-Smtp-Source: APiQypKIdlRCxjvzdcfQPWGBZrD2KONfODLDq03wW5cZcsFhbE6glPTU5E7Q+hrtYXFf8ErEVAe/ X-Received: by 2002:aca:ebca:: with SMTP id j193mr3375130oih.124.1585759502246; Wed, 01 Apr 2020 09:45:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759502; cv=none; d=google.com; s=arc-20160816; b=TFb5x5U6Sle/j8APjRPOBYPZVTkxmrEN+zNaaq+Fiea+erdV4V4DazlnD0AW6iMTSG dWaelNGAI568K/BJT+6sdsItY4JQdJTJRvZ0l5FsYoaz/JnZgrLgMSk2wvQAs+/d0jb8 JLZEUirqTLjbAy9/n23P2kyi8gb+XEpPTMP+/Sh3t5ccYFRmK1WF2U8Fxs7XAEFz9LQJ 29QBFibLCgxE8HEXFqBkLwYLblHjwGfKHtbYZVV6yRP246pcJyONH4A3OJJHtJPPLAUa 2TpPieIyy4EuzR0+5elbLjbmMN4EM4YHap72WsBpydmrvlIayjWDh77XzBKN6JC6T4r4 7QTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kyjl1j0RqJndWPzSpIIK4OLKnAwLG8AOG7oij1r3zKQ=; b=BpoUAubbHm9yLE/NQCFNoc/NJamCDOhRljfrjXjQ4mbIV0rW6o+sNtO8jAz/53SI6s oGMpmcP7LR/1jNkglKyD0rN15iQwvUI/V1wVrIfrmhOISsrddo2kexuKflcSJbPhpkXk 6YHbQb+iyl7fK6D4U/lnzI+bKGKKjH74eogAwoXwoKXQIiQceOVUregQ04ebd/TCCc2e ae1XH9ku3beWCKtGleVJfocpKKHQcFMt9fbeiTGH/YwH4vIuwY3UZVNWvLkgBinHA++p bDDUematXUTyBwfrCyqhHCLlCdTgNqIRH1Qj8NAw9Z/ti5b1Sri8xxfw+I3mzTcKivDX 0JDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HUB0QYJ7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 26si1080879oiz.107.2020.04.01.09.44.49; Wed, 01 Apr 2020 09:45:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HUB0QYJ7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389534AbgDAQoD (ORCPT + 99 others); Wed, 1 Apr 2020 12:44:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:44966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389512AbgDAQoB (ORCPT ); Wed, 1 Apr 2020 12:44:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8386E2063A; Wed, 1 Apr 2020 16:44:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759441; bh=SKezd3hTCZDSA3HVF8gUR5nBnyW55dO8DbZHa6vRcio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HUB0QYJ7245fJdcdInYNzFGP8a91Ahn0QuGtj6x+NseYIcW0AkKOx2Ke/lCPifVJn cBBtkeuMndRkz4sgT42x5NNjxCDddVOF11wQxq0Wj0jpbX4J5xkY1U/jgNbGv5o+uV RWYoKpzD8qKFprheTFIt1/0zAL5eUD+i7+toN854= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anthony Mallet , Sasha Levin Subject: [PATCH 4.14 040/148] USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL Date: Wed, 1 Apr 2020 18:17:12 +0200 Message-Id: <20200401161556.647725359@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Anthony Mallet [ 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: Anthony Mallet Cc: stable Link: https://lore.kernel.org/r/20200312133101.7096-1-anthony.mallet@laas.fr Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/class/cdc-acm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 0453f0eb11781..74d0a91e84273 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -926,10 +926,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; @@ -947,9 +947,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); -- 2.20.1