Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6227AC2D0DB for ; Fri, 24 Jan 2020 14:20:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2EEFE2087E for ; Fri, 24 Jan 2020 14:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875652; bh=EPmA2zirvc5Pz7HNThNXC1RSd9j2S88QrrFYdgTC6bA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V25Lc3xIWNWNwyqhX1IaQytb9d7GnktqwkMCxqlJzkywZ5Doy4qvjvILYZXtOA4N+ Wm7OAibVfpUWEdVyJzsTe8A/GvV59cxJtZ9ZOKpnLz+HHu49nZBIiCFvTZYOvDRL1I M8q1uHqkpwHgx5BNOC1ecn56ROVL4roHaqYJY27I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392153AbgAXOUv (ORCPT ); Fri, 24 Jan 2020 09:20:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:42200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405072AbgAXOUu (ORCPT ); Fri, 24 Jan 2020 09:20:50 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5EA5E21734; Fri, 24 Jan 2020 14:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875650; bh=EPmA2zirvc5Pz7HNThNXC1RSd9j2S88QrrFYdgTC6bA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PconBqYd2tIfEFMvjgYV66Lcf2VSYvBpDTDOZV+prmlGD97Z5bzQNxQNagN9qry+k 6yXfEvOjTdVKPuRALE3nePGc+ZKDESL49H2uo1hc3QQyNOftLQ9HtLpykteSP1mRMn UUqoA2rQikLUtuXzXQXE8WpdQKvrtYDcj6yNxBkQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Hovold , Greg Kroah-Hartman , Jakub Kicinski , Sasha Levin , linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 32/56] NFC: pn533: fix bulk-message timeout Date: Fri, 24 Jan 2020 09:19:48 -0500 Message-Id: <20200124142012.29752-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124142012.29752-1-sashal@kernel.org> References: <20200124142012.29752-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johan Hovold [ Upstream commit a112adafcb47760feff959ee1ecd10b74d2c5467 ] The driver was doing a synchronous uninterruptible bulk-transfer without using a timeout. This could lead to the driver hanging on probe due to a malfunctioning (or malicious) device until the device is physically disconnected. While sleeping in probe the driver prevents other devices connected to the same hub from being added to (or removed from) the bus. An arbitrary limit of five seconds should be more than enough. Fixes: dbafc28955fa ("NFC: pn533: don't send USB data off of the stack") Signed-off-by: Johan Hovold Reviewed-by: Greg Kroah-Hartman Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/nfc/pn533/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index fcb57d64d97e6..a2c9b3f3bc232 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -403,7 +403,7 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) cmd, sizeof(cmd), false); rc = usb_bulk_msg(phy->udev, phy->out_urb->pipe, buffer, sizeof(cmd), - &transferred, 0); + &transferred, 5000); kfree(buffer); if (rc || (transferred != sizeof(cmd))) { nfc_err(&phy->udev->dev, -- 2.20.1