Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49a5b473 authored by Ira Weiny's avatar Ira Weiny Committed by Greg Kroah-Hartman
Browse files

net/tls: Fix kmap usage 



[ Upstream commit b06c19d9f827f6743122795570bfc0c72db482b0 ]

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.

Fixes: e8f69799 ("net/tls: Add generic NIC offload infrastructure")
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7bedf1d8

net/tls/tls_device.c

+2 −1
Original line number Diff line number Diff line
@@ -549,7 +549,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;
@@ -564,6 +564,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);