From mboxrd@z Thu Jan 1 00:00:00 1970 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=-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 BAE0AC2D0A3 for ; Mon, 9 Nov 2020 13:21:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CF9A208FE for ; Mon, 9 Nov 2020 13:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928065; bh=t/oVmvx3FKMad9dfXELoANOthvBeVY5y4WeFwh3C9Ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NGi9G6ptszOSQSP8MpGKFnB4Z7fpU/Glzhd9Rkf6IaP3jA/dAQX75gSCa9rR5rgyS Utnf71lUTiHkmKohRVqHOERSEMP5oXGFGr5wL7FkzYGQ0pwnGZ1MhpCZwuoNkxZRj9 WybEi6uYokVHn1iRisrmn9iFNE1SbJm2YcJQB/24= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387764AbgKINVE (ORCPT ); Mon, 9 Nov 2020 08:21:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:48716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388004AbgKINVA (ORCPT ); Mon, 9 Nov 2020 08:21:00 -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 1769A20867; Mon, 9 Nov 2020 13:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928059; bh=t/oVmvx3FKMad9dfXELoANOthvBeVY5y4WeFwh3C9Ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JDpMQad6xrhpuK8juqQktQ4SJEw4WRMT5tFPtSbnjw91128pZvZRl9Rd/fNvWerQq qjKembOs1eDg8g8IUVmMk0gXNgcqTe0ITJLwepgPDhzY36fi9zBdJeejVW5BTEfFy7 fL160vWVe8VZqUcXOhm7poDW04+dg6nDfZuy/wdE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, zhenwei pi , Sagi Grimberg , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.9 096/133] nvme-rdma: handle unexpected nvme completion data length Date: Mon, 9 Nov 2020 13:55:58 +0100 Message-Id: <20201109125035.316518001@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125030.706496283@linuxfoundation.org> References: <20201109125030.706496283@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: zhenwei pi [ Upstream commit 25c1ca6ecaba3b751d3f7ff92d5cddff3b05f8d0 ] Receiving a zero length message leads to the following warnings because the CQE is processed twice: refcount_t: underflow; use-after-free. WARNING: CPU: 0 PID: 0 at lib/refcount.c:28 RIP: 0010:refcount_warn_saturate+0xd9/0xe0 Call Trace: nvme_rdma_recv_done+0xf3/0x280 [nvme_rdma] __ib_process_cq+0x76/0x150 [ib_core] ... Sanity check the received data length, to avoids this. Thanks to Chao Leng & Sagi for suggestions. Signed-off-by: zhenwei pi Reviewed-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/rdma.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 116902b1b2c34..3a598e91e816d 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1767,6 +1767,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 -- 2.27.0