]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/tls: Fix kmap usage
authorIra Weiny <ira.weiny@intel.com>
Tue, 11 Aug 2020 00:02:58 +0000 (17:02 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:24:10 +0000 (08:24 +0200)
[ 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: e8f69799810c ("net/tls: Add generic NIC offload infrastructure")
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/tls/tls_device.c

index a562ebaaa33c33d0b1806b45227d8c2a0462e4e8..0ad8b53a8ca4116b106e27d16b850133711d4d4e 100644 (file)
@@ -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);