Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3028086pxb; Mon, 18 Oct 2021 06:54:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOu/9pHA59meQbUDhbk9okvhM0WrftYQ3uiBvnxW3pDcx/A/dJg+aFRzkfU6lq17ZOkg/Y X-Received: by 2002:a63:3c13:: with SMTP id j19mr6680423pga.13.1634565299378; Mon, 18 Oct 2021 06:54:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634565299; cv=none; d=google.com; s=arc-20160816; b=Dlymk0m9WkbT+TkQS4+XBABrdlJN3tnuNGK4H4Zgl+N6rryq8xzk9da5rwJlMpDAwj BA0lJ8s4hX7bK7t8Oxqns/+bzY/ozPKZJq651ovX+Lh763Iu7vBAzslJpe363z8Upd1G DqM+7Tst/9pYFoK4FU3Jbi66BTjuTCIQLJWs5P8lu6PmY/s8PndlkyNz1IuohnhJeF/t MLolUNg+qopRUVWFDBmDT3h1MMq3rZ0RifSNAR9FcM6VE+J4M4DJYEM2gFhc0ioBTn57 tDt+v+jMPXxZPPbWETViYCEUXz2wMUikrVMZj0sJUtJquNYEa4N4+tMlJMKaTxGnojyk /44Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DcllJOihh+hWaTqPKXwbTZSt6u2TBS8X7WPGaHESms0=; b=dzANNEO9d5VIsOPmzrLqkbasQ4dr0YOuaWXMts1xwnnz7ziY/mkePG6Ge6Y+b/EQoF FtL5w+nxPk8z/3C5VC31k6HyTMzkzAfo7kapL3H6m5ZE8W8q8Q/w7R2wAkgrZW9eMUWB Qe0yw0U0zQLWoCUI5nwkyERYobYmiQ2PoBUJsb2Gh857hQZBgFHtIz6zqvhmjFppYWtJ DqtumWRfFiSkAs/XaVrGKjhMHvvJ88EVKEl2XjphYZ52Sn4H6pcSJooJbh2uFKJEbefL uM12PITcL8BMgvLJ4+Yh7QQ0albRnFJF6m90BPcLfracFmnM4y6U2PtL9kp8Re2Fn5Sm +KiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZKNpiTGR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 68si17937094pfe.367.2021.10.18.06.54.46; Mon, 18 Oct 2021 06:54:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZKNpiTGR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232445AbhJRNy2 (ORCPT + 99 others); Mon, 18 Oct 2021 09:54:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:50498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233823AbhJRNwA (ORCPT ); Mon, 18 Oct 2021 09:52:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 20D7D6137D; Mon, 18 Oct 2021 13:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1634564314; bh=O5ef+wnLu1DDoIK3by6Pk0FoJJ009TkVaOAj800ysZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZKNpiTGROEUaKGuOePNkFxEsMC9bdA1hP5T5SxCsGfsxdEm335eYqKRDQhcoQvgAd VhccsxXEGbUV0/3MHhlTxWZ6oYtFIXYstyi6xNmRfArk3NDQrfSnL6n3F5UIDZUws+ bPyn+p9qbYwS1dnKPq7V2yxMGyHlPOLNRctRhxQg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavankumar Kondeti , Mathias Nyman Subject: [PATCH 5.14 043/151] xhci: Fix command ring pointer corruption while aborting a command Date: Mon, 18 Oct 2021 15:23:42 +0200 Message-Id: <20211018132342.099941321@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211018132340.682786018@linuxfoundation.org> References: <20211018132340.682786018@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pavankumar Kondeti commit ff0e50d3564f33b7f4b35cadeabd951d66cfc570 upstream. The command ring pointer is located at [6:63] bits of the command ring control register (CRCR). All the control bits like command stop, abort are located at [0:3] bits. While aborting a command, we read the CRCR and set the abort bit and write to the CRCR. The read will always give command ring pointer as all zeros. So we essentially write only the control bits. Since we split the 64 bit write into two 32 bit writes, there is a possibility of xHC command ring stopped before the upper dword (all zeros) is written. If that happens, xHC updates the upper dword of its internal command ring pointer with all zeros. Next time, when the command ring is restarted, we see xHC memory access failures. Fix this issue by only writing to the lower dword of CRCR where all control bits are located. Cc: stable@vger.kernel.org Signed-off-by: Pavankumar Kondeti Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20211008092547.3996295-5-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-ring.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -366,16 +366,22 @@ static void xhci_handle_stopped_cmd_ring /* Must be called with xhci->lock held, releases and aquires lock back */ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags) { - u64 temp_64; + u32 temp_32; int ret; xhci_dbg(xhci, "Abort command ring\n"); reinit_completion(&xhci->cmd_ring_stop_completion); - temp_64 = xhci_read_64(xhci, &xhci->op_regs->cmd_ring); - xhci_write_64(xhci, temp_64 | CMD_RING_ABORT, - &xhci->op_regs->cmd_ring); + /* + * The control bits like command stop, abort are located in lower + * dword of the command ring control register. Limit the write + * to the lower dword to avoid corrupting the command ring pointer + * in case if the command ring is stopped by the time upper dword + * is written. + */ + temp_32 = readl(&xhci->op_regs->cmd_ring); + writel(temp_32 | CMD_RING_ABORT, &xhci->op_regs->cmd_ring); /* Section 4.6.1.2 of xHCI 1.0 spec says software should also time the * completion of the Command Abort operation. If CRR is not negated in 5