Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp9842pxa; Mon, 10 Aug 2020 17:03:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEkpLVg+RaibtUq+vIHEmovXohgdHYqwfpD5eb1hcG7ccVFnsWxcavsdzYFhnA8dV1wHOf X-Received: by 2002:a17:906:24d0:: with SMTP id f16mr23074412ejb.325.1597104239614; Mon, 10 Aug 2020 17:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597104239; cv=none; d=google.com; s=arc-20160816; b=dPOdfEGpR3hYcRXJTDILuRCoGl6qaSJDRlraymCW+oTlZ9Ofcuzrckf502VizXkai7 4LcyZbfAK6bSbRkJlOnvAq1XPmaAXAP/+kCAHoe79Tvvcikrp2A1vfTBgKLovTPOpuBL gRBsC41n2q0NrYx3Rtws99WH+qdR4W+PJMy3KMVslak0iqzGl5dG0EW0KitWTMeTliOg gPAbhcxT1QKF7ZbnF7ge4OQE18hvyaTJS9pAYh3zRHCn3HrHfYp/7odNGn+S2xxcQTFJ vKuu6+GcABcNlM/Dd8ANSX/nSVy9PtRUXGsOypElEP+VSeJ1goFG9VEcew5xgpqW20f/ Nkag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=QHE7MBlL6pZcAkt2Tq9kNyW9Mj5rrMVb7BTmhulsEII=; b=f6ybuE2SVV6Q/yWy5bmgL2oQ2TJNtZgFN74LBvptHDWrZgNr2XmR1ZAfndM6j3B0hc y98+8ILiwE2WfNCnO/sxqp8jTvbmSMBLX5JYr9/YlxUXOOQvu3o4BokC+N4oruuR1WIp N11cE2huu5yr6EHIImL6ZzX4HQYay02l8NVTOlhhOL4TQmYYlX+UnXhSLLcqFrWASP+M w77NQ+d/b4BCwQVl23oroh7xTHYSH3Y2WzF2shuuXHMAlk0qrtpC5Ji9efbLyvEWtlZf vOscV5Ie4X+ZsIGoy9x63K9VGOn3Lr8/HxlIiLGyfwtmARWEm6mGc1pIKcDpGKBmMNW2 8C+w== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u24si13945648edi.194.2020.08.10.17.03.35; Mon, 10 Aug 2020 17:03:59 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727805AbgHKADD (ORCPT + 99 others); Mon, 10 Aug 2020 20:03:03 -0400 Received: from mga02.intel.com ([134.134.136.20]:22100 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726733AbgHKADD (ORCPT ); Mon, 10 Aug 2020 20:03:03 -0400 IronPort-SDR: 9RZNHRGXO1ycF7wxPHXYrhoMomwbQ3zoKqEvxp6xQqCpwzN9VEO7E9h9h3c3m9GqJB4UM9YtEL VYOfR8BjjaGg== X-IronPort-AV: E=McAfee;i="6000,8403,9709"; a="141498658" X-IronPort-AV: E=Sophos;i="5.75,458,1589266800"; d="scan'208";a="141498658" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2020 17:03:02 -0700 IronPort-SDR: xoPjqZyc1+7oOVqcu8XRvlVY+BTfSmmneyOXGUhmXC7ZHQbK6nLF7NqOv690CosdLHBAu8hsmz UEfs3ix+nwqw== X-IronPort-AV: E=Sophos;i="5.75,458,1589266800"; d="scan'208";a="469231771" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2020 17:03:02 -0700 From: ira.weiny@intel.com To: Boris Pismenny , Aviad Yehezkel , John Fastabend , Daniel Borkmann , Jakub Kicinski , "David S. Miller" Cc: Ira Weiny , Ilya Lesokhin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net/tls: Fix kmap usage Date: Mon, 10 Aug 2020 17:02:58 -0700 Message-Id: <20200811000258.2797151-1-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ira Weiny When MSG_OOB is specified to tls_device_sendpage() the mapped page is never unmapped. Hold off mapping the page until after the flags are checked and the page is actually needed. Signed-off-by: Ira Weiny --- net/tls/tls_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 0e55f8365ce2..0cbad566f281 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -561,7 +561,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, { struct tls_context *tls_ctx = tls_get_ctx(sk); struct iov_iter msg_iter; - char *kaddr = kmap(page); + char *kaddr; struct kvec iov; int rc; @@ -576,6 +576,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, goto out; } + kaddr = kmap(page); iov.iov_base = kaddr + offset; iov.iov_len = size; iov_iter_kvec(&msg_iter, WRITE, &iov, 1, size); -- 2.28.0.rc0.12.gb6a658bd00c9