From patchwork Mon Sep 21 11:35:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 11789469 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 700C716BC for ; Mon, 21 Sep 2020 11:36:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 568E320EDD for ; Mon, 21 Sep 2020 11:36:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600688182; bh=zvcSKdka8MWJDFF0L4+TxqQovqXBODY1v6/sOJYC9yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mRWMyN/8GBw6GQCWYroN/2bCFdLfbj7D+K70PIYjKvJXOILg28j4WhEZYx1ZSohqA Epb0KEEtW57wXZCVgj7BCpcavE1hXpgSrSyrHGqfl1dvg8kfds9M8PG5DiPClNiDZG YezGWdLDwwBrOfBt6gG/VRdVjozV02+cFbx2qlyQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726738AbgIULgV (ORCPT ); Mon, 21 Sep 2020 07:36:21 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:43665 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726430AbgIULgU (ORCPT ); Mon, 21 Sep 2020 07:36:20 -0400 Received: by mail-lf1-f65.google.com with SMTP id y2so13581272lfy.10 for ; Mon, 21 Sep 2020 04:36:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QeNREgn/VBFyeE24M7SC8hPxyEUzwzXz3H+WzHOfyA8=; b=L396xKC1E1IKeHA6Gk+i0JqY9AFOtA9HyBfpWp1qPmE0j8kkXHjnFu27B7IXpwQ/U5 WHrxg+JwuGgM7T40//0svvfU0h0qtGmSeSgSwhrCF0iZmnjPlGIUfn4T5GLynyeky+nt fyjn22oi9K2iJ+H7BE4vHuNt2/dTjmE5Ye/gyxJ+1XrxxgTgnVOf0sGPIVc84x4A6RiP ltqrzXRYRPKEHLOTys7hMthdjU+Qggno46IbQBIUUZRH5Swcp8DZe4U7c0VNyw9hW3tp 0EYRdYBQw2AMtt63cTSAiL6m24wkkz7zwXbdzhwWG0wST9Rh+p87zW1FlzLb/3hGuVJd FKBA== X-Gm-Message-State: AOAM53071sTAnHWQvDO3bgYl1V7YCFp0D5FM3vVnHPY1c6rvo0emMGI5 8tBTbNi22tAHWcp+FXSV5E/aHsKqH4U= X-Google-Smtp-Source: ABdhPJyNVLRQzI97ecwBgfZ+VJ39XcfNVtbrzByEuP8eqyYGfQYGFUUUjMklj0sWNTAFJE6iEVYSBg== X-Received: by 2002:ac2:4301:: with SMTP id l1mr14050269lfh.389.1600688178408; Mon, 21 Sep 2020 04:36:18 -0700 (PDT) Received: from xi.terra (c-beaee455.07-184-6d6c6d4.bbcust.telenor.se. [85.228.174.190]) by smtp.gmail.com with ESMTPSA id z10sm2497275lfa.10.2020.09.21.04.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 04:36:17 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.93.0.4) (envelope-from ) id 1kKK79-0008OB-4S; Mon, 21 Sep 2020 13:36:11 +0200 From: Johan Hovold To: Oliver Neukum Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, Daniel Caujolle-Bert , Johan Hovold Subject: [PATCH 1/4] Revert "cdc-acm: hardening against malicious devices" Date: Mon, 21 Sep 2020 13:35:22 +0200 Message-Id: <20200921113525.32187-2-johan@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200921113525.32187-1-johan@kernel.org> References: <20200921113525.32187-1-johan@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org This reverts commit 2ad9d544f2497a7bf239c34bd2b86fd19683dbb5. Drop bogus sanity check; an interface in the active configuration will always have a current altsetting assigned by USB core. Signed-off-by: Johan Hovold --- drivers/usb/class/cdc-acm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 7f6f3ab5b8a6..e28ac640ff9c 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1196,9 +1196,6 @@ static int acm_probe(struct usb_interface *intf, return -EINVAL; } - if (!intf->cur_altsetting) - return -EINVAL; - if (!buflen) { if (intf->cur_altsetting->endpoint && intf->cur_altsetting->endpoint->extralen && @@ -1252,8 +1249,6 @@ static int acm_probe(struct usb_interface *intf, dev_dbg(&intf->dev, "no interfaces\n"); return -ENODEV; } - if (!data_interface->cur_altsetting || !control_interface->cur_altsetting) - return -ENODEV; if (data_intf_num != call_intf_num) dev_dbg(&intf->dev, "Separate call control interface. That is not fully supported.\n");