Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp297025pxf; Thu, 25 Mar 2021 04:29:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1sjCZBhQZ6IPMXAQGhndnP0tNlxJnHstE9twYA7n3G2sxdeg7C8IEZd1fMqE6GjW+CS9e X-Received: by 2002:a05:6402:1545:: with SMTP id p5mr8432768edx.155.1616671770286; Thu, 25 Mar 2021 04:29:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616671770; cv=none; d=google.com; s=arc-20160816; b=MLoncWSnOtzRe/LHjgI2xyaak7t3jszc9kWBSiK1LKIFzzcSrcWIxKwOCHRr6xCkO6 GX7MvPKAunNMBBZAzL/jXw2ykCELuiQz72BDuR+VjSL0eb4qhVjQSaIKnmm6tK06vsRv hfsGfPt/tNUJWf8V+eWn583kJFFgT72ZidmSz3EEzz+SIWkh+aK+kAZRKawpy60AvBbt ++sX55iyVsvYLPU9Oa0qDALoUxhHQAJSJ9wSQ+hY8FxY0lUJFHY5vTJYDhNmcI6skhLp P94OuoHdWqUjtymyXX0+Xk4MZQahWGedLezEpOSrrsazCG4F2ey3Blx8KyHjtI2WhMBQ pIVg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MVupHgnl/Bkg1HItKP2A0t4ISgTQiCNmh4k03/k/SaQ=; b=vJ2Ta2islIyxxMT8r+NB/Ry6sah81i8O+R6w9Y/8Lr5SB8JBtzBANLeoC2SxTRP8nQ gaA0NTsrV5ZXwv/1Toa6cJINY0u2YSlJE3/LXsNUIYcpWap8tsDIlFctOGpsubvUgLqk yckpQxuH9BJSzUjS7voElGJrJ7dq4xvUOsiLsiXGPwmaRbSxW4wFcABIKKgoE1ZZ3lGH scUXnMkvJDYTuR+CJIbdYRCP0pkj1efZW/LUomK4FG8Lapt2awjOjWrmBanjszC3k+l4 j0cdHXbwpZhmsayrX08hGyursBRwshRbfAadZKc6g/6zcyE/xpp2Z3RhzUYKMF+VWyvh ULxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KQMnqjAl; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a1si3842634ejg.521.2021.03.25.04.29.07; Thu, 25 Mar 2021 04:29:30 -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=@kernel.org header.s=k20201202 header.b=KQMnqjAl; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231265AbhCYL2N (ORCPT + 99 others); Thu, 25 Mar 2021 07:28:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:34156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230332AbhCYLZq (ORCPT ); Thu, 25 Mar 2021 07:25:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9BBE861A34; Thu, 25 Mar 2021 11:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616671546; bh=/9ujew30/khoYdl8uTOuMTpa+/+vYu2kig65Xjphl34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KQMnqjAla4wqTSPGmJDh0Q8bjpSel62gFLJWqVj3T8ZUuErUEWYrrkJKXp2SCu77L 0vDPCjiv5h3rO8/tbqZWeE5tsoL9fH/nstmy2omkjLcOA1OY1v/yOlyeql3CsK3jkS 54mne8paNCM8DiS+96AVGlM9pi723NlaHveYMl+AfK/LBWllg+M0w4CBTrx+7xoiGe k0gipQX8vnH4xpOTMtxIwTgA8DGYoyhfoRjPX9QwLUwSgTpfolvQZ9NYYNPkn5T/nw YiFRBNFVxHZlBFKybhdzn8P/554aAfPpEqTGdvhtQxLYhvYdK2iVRY4iMg2XwABaa3 TZtBdVW8b0NsA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Elad Grupi , Sagi Grimberg , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.11 36/44] nvmet-tcp: fix kmap leak when data digest in use Date: Thu, 25 Mar 2021 07:24:51 -0400 Message-Id: <20210325112459.1926846-36-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210325112459.1926846-1-sashal@kernel.org> References: <20210325112459.1926846-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: Elad Grupi [ Upstream commit bac04454ef9fada009f0572576837548b190bf94 ] When data digest is enabled we should unmap pdu iovec before handling the data digest pdu. Signed-off-by: Elad Grupi Reviewed-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/target/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 8b0485ada315..d658c6e8263a 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1098,11 +1098,11 @@ static int nvmet_tcp_try_recv_data(struct nvmet_tcp_queue *queue) cmd->rbytes_done += ret; } + nvmet_tcp_unmap_pdu_iovec(cmd); if (queue->data_digest) { nvmet_tcp_prep_recv_ddgst(cmd); return 0; } - nvmet_tcp_unmap_pdu_iovec(cmd); if (!(cmd->flags & NVMET_TCP_F_INIT_FAILED) && cmd->rbytes_done == cmd->req.transfer_len) { -- 2.30.1