Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3032554pxb; Mon, 18 Oct 2021 07:00:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuoKruLpgucRrlrYXFTfnVWQYBJ8gifHco0xLVf3Tah973zKQtdKWc+ptYgScC6aVQSmwq X-Received: by 2002:a17:90a:d311:: with SMTP id p17mr28919771pju.155.1634565611144; Mon, 18 Oct 2021 07:00:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634565611; cv=none; d=google.com; s=arc-20160816; b=I2Q0UEihaq5XmCJt8MDJs4R3njp3BUKf8jJ68Q0B9KbIDqgwXu1/lSjfwS7XI7yfP+ wUOGKULqh4M2mGyeeOOm+2Ot+MzSt0UrgaJ6ns3V3mZJ7oXO52UXtFfV6l3IcQiJqE/w Xg6VYdAR/erlOFNamIqrNQnRZdOFg5r+XnY3z+QSkW7aSfIwn6T8w9fdY7DrlDl/ZloU pa/Pf/mIzR9uSf3GQzlZAT/goofdIn49FByRxRLPcJei9biX7xeBM+WVQw3wgAZA1GC+ Y5/q7+lXhjMyhfw/uTcJtr/4qO0G2jMCH1F73qes6dCpSTo88ftka+BeQkHa1kNhESEb 9Ggw== 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=rSKJcdSbyKQv206zi6fKWbWLqbVv1KCaATaAaq1V8UE=; b=LHya35agG5U9PLikjP+tZk7++npVeoFP6/VGdtMXgsj8K1lG959Eif+yltfhsvorpt bNzN698zVC/LydfN5qtY0cDPlOta3OLUhGOYfcVC85EnSkqypyurRCEdFTyHIDxSCVrt cJFqatWxBm9gYb5yJPSC0kxyT9V33JGMmLL3PwJU01TKGuE8rUJNUJCnvGXb59S9Rdfl hDzQgUTpMMf+5LiEVL1e88zqJoCidN/EUMY4S173L2rtd7PLraRQwUox6dOOl0th5yT4 VOaxXkqqenPwM+Q0SdrhOTyVhoZj+OWAvdoNrDqkgw1At2ZcVhK6CYOuFZQQe/1H17We F46g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BxmtCRwF; 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 q28si3393542pgu.255.2021.10.18.06.59.57; Mon, 18 Oct 2021 07:00:11 -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=BxmtCRwF; 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 S234115AbhJRN7y (ORCPT + 99 others); Mon, 18 Oct 2021 09:59:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:58122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233694AbhJRN5s (ORCPT ); Mon, 18 Oct 2021 09:57:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6A76F6138B; Mon, 18 Oct 2021 13:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1634564462; bh=VybyTtxfkLbJJLoQqeiB7YIRwkUh6Xc42xiBXu4NZGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BxmtCRwFhPajx4n5F9Fviv5TaROfeU/QNfe1C4R1gLncOCiwRzuz8ygNfJmUAIMdC otrrI2cGTTF1bBFqI9RUySryEwNibPu3rjDshuKi9CGRkpNeL7H4Xynj8a24DxasWK QosFNbddJQ22elDjBvNvdIO+0g9lCegfgIEXM9Lk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sagi Grimberg , Keith Busch Subject: [PATCH 5.14 097/151] nvme-pci: Fix abort command id Date: Mon, 18 Oct 2021 15:24:36 +0200 Message-Id: <20211018132343.825552678@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: Keith Busch commit 85f74acf097a63a07f5a7c215db6883e5c35e3ff upstream. The request tag is no longer the only component of the command id. Fixes: e7006de6c2380 ("nvme: code command_id with a genctr for use-after-free validation") Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1331,7 +1331,7 @@ static enum blk_eh_timer_return nvme_tim iod->aborted = 1; cmd.abort.opcode = nvme_admin_abort_cmd; - cmd.abort.cid = req->tag; + cmd.abort.cid = nvme_cid(req); cmd.abort.sqid = cpu_to_le16(nvmeq->qid); dev_warn(nvmeq->dev->ctrl.device,