Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp834871pja; Wed, 1 Apr 2020 09:33:21 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs8U/i7Jz503p5bFN8Ais6mw5nPP0iqeN3TL/oAOSYLbVnk61QQq22vilk9eOOQf8NLEj/F X-Received: by 2002:a4a:aece:: with SMTP id v14mr17337185oon.48.1585758801206; Wed, 01 Apr 2020 09:33:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585758801; cv=none; d=google.com; s=arc-20160816; b=ALLVTIaNM7i03lWXX2MlMv+YjCVpHRDbErYvLEpHlSt4LB7ZywkJeHRJ3lqRh9U/Ey 3pwtKLlHCOLHNQzwSHPEwFBAfJvCjReV+4AWkyOP5/MLzQ08T5ovN0AOtimiqagVrbp6 sJJ8klOfTsEobwRlMjiWNrV7pllj7C7mUXUQl544Admecxsay9du7Q5Ncf5jxYaSqCSr cXaAumwQCBwOG4oEyn1y7ttB39A1pxMjQS5NoajwoJ27r2Fnie05ued2epI1Y1IOufXi LIhjE3fMsSDQXc1ZsqDGyFhJUqHt2ChsZ18lySnCLj5sv/Kd5ZCjlTeimZAhnQkNLzUC uCDw== 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=eFQ1DUAHCnkApRzAdxZ3rS5PYQ27+LlLvJD+WisyepA=; b=KKp6fyBja5IVTyl5mrkafd62g9tQCaSwN5vcTTpGTnosoqhXRENpQc4F/sK8YfH3S1 vdM5GqpEFBq+8TQTOF2UhQOvwxM/AsMZwGQ/92aWV4yscyJ47KzMq+O8LV+8WBUk+ha0 1eAaDs0dHHCjFB8dCLcDoaW+dL8viQEQwA8Qt135TryLlYCLfGO2CRm6nlWyI6d/nL4G B7EjJTRWRNbtXv7r3mv8nr3o02qvB8HOStUq9PDs5HTIQvfB9QwY6tdgIMoYx0C3R8HN kD5coWjYuKDvWyCG3rT9EH3Vu45e7ckxqcHoF1CjbGRYq1IeVitDI81jtHhb02+hFWr7 9IxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uvJYlnLZ; 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 b14si1027638otj.154.2020.04.01.09.33.08; Wed, 01 Apr 2020 09:33:21 -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=uvJYlnLZ; 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 S2388446AbgDAQch (ORCPT + 99 others); Wed, 1 Apr 2020 12:32:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:58936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388431AbgDAQcc (ORCPT ); Wed, 1 Apr 2020 12:32:32 -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 1BF7E2137B; Wed, 1 Apr 2020 16:32:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758751; bh=27tOJ/fqaKJz1WNpw0k9xBEiOTjwYrhPMg+mkJLaie4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uvJYlnLZRn1ztY6YLOiD7GwsmHo1/AfEvhVNklzouoXkFGaybnD11ytInpvyKeqr9 0oSiZf4qkNDy6P4zv16y9O0XUT8T4LIdwnRjSSCeysasydRowV0yWREExfRrJgo9mD yYH4eNdpmpId2l3b5dlYKdKoOGYeYcvI+S6IT6+k= 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.4 26/91] USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL Date: Wed, 1 Apr 2020 18:17:22 +0200 Message-Id: <20200401161521.999221772@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161512.917494101@linuxfoundation.org> References: <20200401161512.917494101@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 1930a8ec4b67d..3cb7a23e1253f 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -841,10 +841,10 @@ static int get_serial_info(struct acm *acm, struct serial_struct __user *info) tmp.flags = ASYNC_LOW_LATENCY; 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; @@ -862,9 +862,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