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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 DD7E5C00A89 for ; Tue, 3 Nov 2020 01:22:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AFB1E2225E for ; Tue, 3 Nov 2020 01:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366578; bh=wn4j3Kdbk75oozAD8j3/jt4R3bWT3iMnq43BEJyuibQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1R3q66uIieqPEfDx1gkSjBgbBLzRIDZWRyo5xQoOx0VykcTqiR9OpY42VFOTflhys 0BU7n4KxC8khRnNm/aJNyNPeiWftZWZ926ZkQFeCW3SBiHiGgOZsY2bBAdcsMaPuku awbE4WSq4hUURtNtaYq8dEyhI1L5MlhVpK76AV7U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727943AbgKCBW5 (ORCPT ); Mon, 2 Nov 2020 20:22:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:36018 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728243AbgKCBUv (ORCPT ); Mon, 2 Nov 2020 20:20:51 -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 C1279223AB; Tue, 3 Nov 2020 01:20:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366451; bh=wn4j3Kdbk75oozAD8j3/jt4R3bWT3iMnq43BEJyuibQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=apUABeD0Ic/EsHaR4u7fyB4v2Dgxo3C8y/gysohvUiataLf+D1SR6scPniBC16dGG nkk8CUTiBXhkKqkG2kjsFiSJv9Vk2ZMgR5F9KN79/0VgnJqIaiwlXWlln3p7iHa0M7 eGKCIVjr6iRlN8ut5PZYgzinUGb1a9p2vygn0nKE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: zhenwei pi , Sagi Grimberg , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 09/11] nvme-rdma: handle unexpected nvme completion data length Date: Mon, 2 Nov 2020 20:20:37 -0500 Message-Id: <20201103012039.183672-9-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103012039.183672-1-sashal@kernel.org> References: <20201103012039.183672-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 077c678166651..a0e44a3f93f5e 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1477,6 +1477,14 @@ static int __nvme_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc, int tag) return 0; } + /* 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