Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp851756pja; Wed, 1 Apr 2020 09:50:57 -0700 (PDT) X-Google-Smtp-Source: APiQypIORxTfuQR+7EREVcteNBqxb4wKSoNzyn92SvLBNJGhS9AMHqDtJXbDGL1KZcv0pYJYFBCl X-Received: by 2002:aca:4d8:: with SMTP id 207mr3381491oie.70.1585759857798; Wed, 01 Apr 2020 09:50:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759857; cv=none; d=google.com; s=arc-20160816; b=fMBSXqTpWbdU3/KlMHnoQdPRXxxS4BYLFMUorN5iTTaXbVuRXoLVHMQUPBmbn8QgXp Pssos/6dGO4zONsFRe+DJ4Cem92MyZ9HHrlGbJx8AIhEZtZP2+JNdhmJNChzdbMx5QqD /A/yGMtb/QTB/G7kroGdmPO82A3gNv6dpAXm8oUm8A4JFwsGf/Vd8mmQ1+IOsy4UHbte GXKF2L3j2sqchkUOgxo2uP6i/IXVL9OMfiAZfDsPpgTi4tyAJHnkTob8xHQIxAs708yZ TkQ4cO+UWqSdyFgG4wijiiG4LsXiKy1Dxi0HawOzylCZkb0ZLuGiFZDZHCsOe6Zk9H32 EjAg== 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=LFjXFPCl5Z/pUskGwz3yuy5vFTXO2awZv0FDu4fLxhc=; b=VF1ieW3B6db5BP1BFVgKYrti4EL+WgKznyzUa0FU8kpZNMLB19OI13vU1fmcO24LlQ eQP8ZRQel53+v/+be/azrceoiP9j2Y1ZDYXaqWv6TwiiLy7CCKOlFsIwNnQR6OxQtncx NnR4lGOTc8N08tBVy5PYX3ZIrw4wZWNoSD9XIH8p9AHJVauG+Sjlk942UjMKr3EgJ+F1 IMwnMGr17KvSJmxPCRsZpHBTgnn/AskUpCpjbY70n37EUpXqMUT0E2feqKfx3Ay7FjRu w4+xmioD8BBVO/BgRHIct8lfBOePA8IgTX+UthuTcw9VusqgjFErMYze3/LMSgdTwHff iUqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gY7esmP7; 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 j25si1052882oii.86.2020.04.01.09.50.44; Wed, 01 Apr 2020 09:50:57 -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=gY7esmP7; 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 S2389643AbgDAQqK (ORCPT + 99 others); Wed, 1 Apr 2020 12:46:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:47424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387520AbgDAQqI (ORCPT ); Wed, 1 Apr 2020 12:46:08 -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 43FEB21974; Wed, 1 Apr 2020 16:46:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759566; bh=NGYYxPkSNRcas7z3Ved7Ug05OaJBKCqcIlSnGkcoDSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gY7esmP7TRcRRuZ83k1I1kRGI6SOcxXbder7mU51OjvVWFqIBv5ybUqF9Zdz3M95n 1gLMe7Q5mQoFA6K183fC6hVR9qfu+nAgGFQXOLDrqeQm28OrjskA9v2zBKURoGqWvJ 82YfvlrsINcquY3PfQ7s0Hy15IgeK4XZWIkvvDu4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anthony Mallet , Oliver Neukum , Matthias Reichl Subject: [PATCH 4.14 117/148] USB: cdc-acm: restore capability check order Date: Wed, 1 Apr 2020 18:18:29 +0200 Message-Id: <20200401161603.715151045@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: Matthias Reichl commit 62d65bdd9d05158aa2547f8ef72375535f3bc6e3 upstream. commit b401f8c4f492c ("USB: cdc-acm: fix rounding error in TIOCSSERIAL") introduced a regression by changing the order of capability and close settings change checks. When running with CAP_SYS_ADMIN setting the close settings to the values already set resulted in -EOPNOTSUPP. Fix this by changing the check order back to how it was before. Fixes: b401f8c4f492c ("USB: cdc-acm: fix rounding error in TIOCSSERIAL") Cc: Anthony Mallet Cc: stable Cc: Oliver Neukum Signed-off-by: Matthias Reichl Link: https://lore.kernel.org/r/20200327150350.3657-1-hias@horus.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/cdc-acm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -961,16 +961,16 @@ static int set_serial_info(struct acm *a mutex_lock(&acm->port.mutex); - if ((new_serial.close_delay != old_close_delay) || - (new_serial.closing_wait != old_closing_wait)) { - if (!capable(CAP_SYS_ADMIN)) + if (!capable(CAP_SYS_ADMIN)) { + if ((new_serial.close_delay != old_close_delay) || + (new_serial.closing_wait != old_closing_wait)) retval = -EPERM; - else { - acm->port.close_delay = close_delay; - acm->port.closing_wait = closing_wait; - } - } else - retval = -EOPNOTSUPP; + else + retval = -EOPNOTSUPP; + } else { + acm->port.close_delay = close_delay; + acm->port.closing_wait = closing_wait; + } mutex_unlock(&acm->port.mutex); return retval;