Message ID | 20201109125025.216501133@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=upl/=EP=vger.kernel.org=stable-owner@kernel.org> 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 3A59BC388F7 for <stable@archiver.kernel.org>; Mon, 9 Nov 2020 13:28:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7E5721D7F for <stable@archiver.kernel.org>; Mon, 9 Nov 2020 13:28:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928498; bh=spIBQukg0Em/6s7m814lEBLeDRX0DkRAJLMt+1e4/nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=habH+JWq3UwgUcHoGCVmM8Ij+1ackCa8t6E4E82xcYmnDX7HbpZ3ejGgwl6Pn89WX K9se/Xt7ulVn9a6T7rMkkzXj6nxZ3Ta2apazBiBTdh0flHXQUIe7ED5KuMjRIpcEU6 c0Oebsmh7CYnTqRGYFapq35NuhamBj1bosHogF3E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733039AbgKINOB (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 9 Nov 2020 08:14:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:40084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733036AbgKINN4 (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 9 Nov 2020 08:13:56 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 322FF20789; Mon, 9 Nov 2020 13:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927635; bh=spIBQukg0Em/6s7m814lEBLeDRX0DkRAJLMt+1e4/nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1IVHSktGYUcthoLqHnI7P6SxMHCaw6VbbECXLpkHrFR4vsKaXk7wZeVXgfr331rcj BCFgjMJL6qMy9ScBr0F8XmbW0GitBKC8BRj48Q7txiSJ8QG696MSqAxwrpjP1KYgdO lwRu2iggE+VqokLO2pQPFNfiksvisvL6LzOzuVEQ= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, zhenwei pi <pizhenwei@bytedance.com>, Sagi Grimberg <sagi@grimberg.me>, Christoph Hellwig <hch@lst.de>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 55/85] nvme-rdma: handle unexpected nvme completion data length Date: Mon, 9 Nov 2020 13:55:52 +0100 Message-Id: <20201109125025.216501133@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125022.614792961@linuxfoundation.org> References: <20201109125022.614792961@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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index a41ee9feab8e7..e957ad0a07f58 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1520,6 +1520,14 @@ static void nvme_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc) return; } + /* sanity checking for received data length */ + if (unlikely(wc->byte_len < len)) { + dev_err(queue->ctrl->ctrl.device, + "Unexpected nvme completion length(%d)\n", wc->byte_len); + nvme_rdma_error_recovery(queue->ctrl); + return; + } + ib_dma_sync_single_for_cpu(ibdev, qe->dma, len, DMA_FROM_DEVICE); /* * AEN requests are special as they don't time out and can