History

Merge tag 'fixes-for-v5.16' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

TEE and OP-TEE fixes for v5.16 - Fixes a race when a tee_shm reaches reference count 0 and is about to be teared down - Fixes an incorrect page free bug in an error path of the OP-TEE shared memory pool handling - Suppresses a false positive kmemleak report when allocating driver private shared memory buffers for OP-TEE * tag 'fixes-for-v5.16' of https://git.linaro.org/people/jens.wiklander/linux-tee: optee: Suppress false positive kmemleak report in optee_handle_rpc() tee: optee: Fix incorrect page free bug tee: handle lookup of shm with reference count 0

Arnd Bergmann committed 4 years ago

Commit a6a47682 parents 2585cf9 6add87f4 files · +72 −114Browse files

Unified · Split

4 files
  1. drivers/tee/optee/core.c +2 −4
  2. drivers/tee/optee/smc_abi.c +2 −0
  3. drivers/tee/tee_shm.c +66 −108
  4. include/linux/tee_drv.h +2 −2
drivers/tee/optee/core.c+2−4
@@ -48,10 +48,8 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *poolm, · 47 unmodified lines
48 goto err;48 goto err;
49 }49 }
50 50
51 for (i = 0; i < nr_pages; i++) {51 for (i = 0; i < nr_pages; i++)
52 pages[i] = page;52 pages[i] = page + i;
53 page++;
54 }
55 53
56 shm->flags |= TEE_SHM_REGISTER;54 shm->flags |= TEE_SHM_REGISTER;
57 rc = shm_register(shm->ctx, shm, pages, nr_pages,55 rc = shm_register(shm->ctx, shm, pages, nr_pages,
drivers/tee/optee/smc_abi.c+2−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
23#include "optee_private.h"23#include "optee_private.h"
24#include "optee_smc.h"24#include "optee_smc.h"
25#include "optee_rpc_cmd.h"25#include "optee_rpc_cmd.h"
26#include <linux/kmemleak.h>
26#define CREATE_TRACE_POINTS27#define CREATE_TRACE_POINTS
27#include "optee_trace.h"28#include "optee_trace.h"
28 29
@@ -783,6 +784,7 @@ static void optee_handle_rpc(struct tee_context *ctx, · 754 unmodified lines
783 param->a4 = 0;784 param->a4 = 0;
784 param->a5 = 0;785 param->a5 = 0;
785 }786 }
787 kmemleak_not_leak(shm);
786 break;788 break;
787 case OPTEE_SMC_RPC_FUNC_FREE:789 case OPTEE_SMC_RPC_FUNC_FREE:
788 shm = reg_pair_to_ptr(param->a1, param->a2);790 shm = reg_pair_to_ptr(param->a1, param->a2);
drivers/tee/tee_shm.c+66−108
@@ -1,20 +1,17 @@
1// SPDX-License-Identifier: GPL-2.0-only1// SPDX-License-Identifier: GPL-2.0-only
2/*2/*
3 * Copyright (c) 2015-2016, Linaro Limited3 * Copyright (c) 2015-2017, 2019-2021 Linaro Limited
4 */4 */
5#include <linux/anon_inodes.h>
5#include <linux/device.h>6#include <linux/device.h>
6#include <linux/dma-buf.h>
7#include <linux/fdtable.h>
8#include <linux/idr.h>7#include <linux/idr.h>
8#include <linux/mm.h>
9#include <linux/sched.h>9#include <linux/sched.h>
10#include <linux/slab.h>10#include <linux/slab.h>
11#include <linux/tee_drv.h>11#include <linux/tee_drv.h>
12#include <linux/uio.h>12#include <linux/uio.h>
13#include <linux/module.h>
14#include "tee_private.h"13#include "tee_private.h"
15 14
16MODULE_IMPORT_NS(DMA_BUF);
17
18static void release_registered_pages(struct tee_shm *shm)15static void release_registered_pages(struct tee_shm *shm)
19{16{
20 if (shm->pages) {17 if (shm->pages) {
@@ -31,16 +28,8 @@ static void release_registered_pages(struct tee_shm *shm) · 10 unmodified lines
31 }28 }
32}29}
33 30
34static void tee_shm_release(struct tee_shm *shm)31static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm)
35{32{
36 struct tee_device *teedev = shm->ctx->teedev;
37
38 if (shm->flags & TEE_SHM_DMA_BUF) {
39 mutex_lock(&teedev->mutex);
40 idr_remove(&teedev->idr, shm->id);
41 mutex_unlock(&teedev->mutex);
42 }
43
44 if (shm->flags & TEE_SHM_POOL) {33 if (shm->flags & TEE_SHM_POOL) {
45 struct tee_shm_pool_mgr *poolm;34 struct tee_shm_pool_mgr *poolm;
46 35
@@ -67,45 +56,6 @@ static void tee_shm_release(struct tee_shm *shm) · 20 unmodified lines
67 tee_device_put(teedev);56 tee_device_put(teedev);
68}57}
69 58
70static struct sg_table *tee_shm_op_map_dma_buf(struct dma_buf_attachment
71 *attach, enum dma_data_direction dir)
72{
73 return NULL;
74}
75
76static void tee_shm_op_unmap_dma_buf(struct dma_buf_attachment *attach,
77 struct sg_table *table,
78 enum dma_data_direction dir)
79{
80}
81
82static void tee_shm_op_release(struct dma_buf *dmabuf)
83{
84 struct tee_shm *shm = dmabuf->priv;
85
86 tee_shm_release(shm);
87}
88
89static int tee_shm_op_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
90{
91 struct tee_shm *shm = dmabuf->priv;
92 size_t size = vma->vm_end - vma->vm_start;
93
94 /* Refuse sharing shared memory provided by application */
95 if (shm->flags & TEE_SHM_USER_MAPPED)
96 return -EINVAL;
97
98 return remap_pfn_range(vma, vma->vm_start, shm->paddr >> PAGE_SHIFT,
99 size, vma->vm_page_prot);
100}
101
102static const struct dma_buf_ops tee_shm_dma_buf_ops = {
103 .map_dma_buf = tee_shm_op_map_dma_buf,
104 .unmap_dma_buf = tee_shm_op_unmap_dma_buf,
105 .release = tee_shm_op_release,
106 .mmap = tee_shm_op_mmap,
107};
108
109struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags)59struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags)
110{60{
111 struct tee_device *teedev = ctx->teedev;61 struct tee_device *teedev = ctx->teedev;
@@ -140,6 +90,7 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) · 28 unmodified lines
140 goto err_dev_put;90 goto err_dev_put;
141 }91 }
142 92
93 refcount_set(&shm->refcount, 1);
143 shm->flags = flags | TEE_SHM_POOL;94 shm->flags = flags | TEE_SHM_POOL;
144 shm->ctx = ctx;95 shm->ctx = ctx;
145 if (flags & TEE_SHM_DMA_BUF)96 if (flags & TEE_SHM_DMA_BUF)
@@ -153,10 +104,7 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) · 7 unmodified lines
153 goto err_kfree;104 goto err_kfree;
154 }105 }
155 106
156
157 if (flags & TEE_SHM_DMA_BUF) {107 if (flags & TEE_SHM_DMA_BUF) {
158 DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
159
160 mutex_lock(&teedev->mutex);108 mutex_lock(&teedev->mutex);
161 shm->id = idr_alloc(&teedev->idr, shm, 1, 0, GFP_KERNEL);109 shm->id = idr_alloc(&teedev->idr, shm, 1, 0, GFP_KERNEL);
162 mutex_unlock(&teedev->mutex);110 mutex_unlock(&teedev->mutex);
@@ -164,28 +112,11 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) · 1 unmodified line
164 ret = ERR_PTR(shm->id);112 ret = ERR_PTR(shm->id);
165 goto err_pool_free;113 goto err_pool_free;
166 }114 }
167
168 exp_info.ops = &tee_shm_dma_buf_ops;
169 exp_info.size = shm->size;
170 exp_info.flags = O_RDWR;
171 exp_info.priv = shm;
172
173 shm->dmabuf = dma_buf_export(&exp_info);
174 if (IS_ERR(shm->dmabuf)) {
175 ret = ERR_CAST(shm->dmabuf);
176 goto err_rem;
177 }
178 }115 }
179 116
180 teedev_ctx_get(ctx);117 teedev_ctx_get(ctx);
181 118
182 return shm;119 return shm;
183err_rem:
184 if (flags & TEE_SHM_DMA_BUF) {
185 mutex_lock(&teedev->mutex);
186 idr_remove(&teedev->idr, shm->id);
187 mutex_unlock(&teedev->mutex);
188 }
189err_pool_free:120err_pool_free:
190 poolm->ops->free(poolm, shm);121 poolm->ops->free(poolm, shm);
191err_kfree:122err_kfree:
@@ -246,6 +177,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · 54 unmodified lines
246 goto err;177 goto err;
247 }178 }
248 179
180 refcount_set(&shm->refcount, 1);
249 shm->flags = flags | TEE_SHM_REGISTER;181 shm->flags = flags | TEE_SHM_REGISTER;
250 shm->ctx = ctx;182 shm->ctx = ctx;
251 shm->id = -1;183 shm->id = -1;
@@ -306,22 +238,6 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · 54 unmodified lines
306 goto err;238 goto err;
307 }239 }
308 240
309 if (flags & TEE_SHM_DMA_BUF) {
310 DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
311
312 exp_info.ops = &tee_shm_dma_buf_ops;
313 exp_info.size = shm->size;
314 exp_info.flags = O_RDWR;
315 exp_info.priv = shm;
316
317 shm->dmabuf = dma_buf_export(&exp_info);
318 if (IS_ERR(shm->dmabuf)) {
319 ret = ERR_CAST(shm->dmabuf);
320 teedev->desc->ops->shm_unregister(ctx, shm);
321 goto err;
322 }
323 }
324
325 return shm;241 return shm;
326err:242err:
327 if (shm) {243 if (shm) {
@@ -339,6 +255,35 @@ err: · 11 unmodified lines
339}255}
340EXPORT_SYMBOL_GPL(tee_shm_register);256EXPORT_SYMBOL_GPL(tee_shm_register);
341 257
258static int tee_shm_fop_release(struct inode *inode, struct file *filp)
259{
260 tee_shm_put(filp->private_data);
261 return 0;
262}
263
264static int tee_shm_fop_mmap(struct file *filp, struct vm_area_struct *vma)
265{
266 struct tee_shm *shm = filp->private_data;
267 size_t size = vma->vm_end - vma->vm_start;
268
269 /* Refuse sharing shared memory provided by application */
270 if (shm->flags & TEE_SHM_USER_MAPPED)
271 return -EINVAL;
272
273 /* check for overflowing the buffer's size */
274 if (vma->vm_pgoff + vma_pages(vma) > shm->size >> PAGE_SHIFT)
275 return -EINVAL;
276
277 return remap_pfn_range(vma, vma->vm_start, shm->paddr >> PAGE_SHIFT,
278 size, vma->vm_page_prot);
279}
280
281static const struct file_operations tee_shm_fops = {
282 .owner = THIS_MODULE,
283 .release = tee_shm_fop_release,
284 .mmap = tee_shm_fop_mmap,
285};
286
342/**287/**
343 * tee_shm_get_fd() - Increase reference count and return file descriptor288 * tee_shm_get_fd() - Increase reference count and return file descriptor
344 * @shm: Shared memory handle289 * @shm: Shared memory handle
@@ -351,10 +296,11 @@ int tee_shm_get_fd(struct tee_shm *shm) · 6 unmodified lines
351 if (!(shm->flags & TEE_SHM_DMA_BUF))296 if (!(shm->flags & TEE_SHM_DMA_BUF))
352 return -EINVAL;297 return -EINVAL;
353 298
354 get_dma_buf(shm->dmabuf);299 /* matched by tee_shm_put() in tee_shm_op_release() */
355 fd = dma_buf_fd(shm->dmabuf, O_CLOEXEC);300 refcount_inc(&shm->refcount);
301 fd = anon_inode_getfd("tee_shm", &tee_shm_fops, shm, O_RDWR);
356 if (fd < 0)302 if (fd < 0)
357 dma_buf_put(shm->dmabuf);303 tee_shm_put(shm);
358 return fd;304 return fd;
359}305}
360 306
@@ -364,17 +310,7 @@ int tee_shm_get_fd(struct tee_shm *shm) · 3 unmodified lines
364 */310 */
365void tee_shm_free(struct tee_shm *shm)311void tee_shm_free(struct tee_shm *shm)
366{312{
367 /*313 tee_shm_put(shm);
368 * dma_buf_put() decreases the dmabuf reference counter and will
369 * call tee_shm_release() when the last reference is gone.
370 *
371 * In the case of driver private memory we call tee_shm_release
372 * directly instead as it doesn't have a reference counter.
373 */
374 if (shm->flags & TEE_SHM_DMA_BUF)
375 dma_buf_put(shm->dmabuf);
376 else
377 tee_shm_release(shm);
378}314}
379EXPORT_SYMBOL_GPL(tee_shm_free);315EXPORT_SYMBOL_GPL(tee_shm_free);
380 316
@@ -481,10 +417,15 @@ struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id) · 100 unmodified lines
481 teedev = ctx->teedev;417 teedev = ctx->teedev;
482 mutex_lock(&teedev->mutex);418 mutex_lock(&teedev->mutex);
483 shm = idr_find(&teedev->idr, id);419 shm = idr_find(&teedev->idr, id);
420 /*
421 * If the tee_shm was found in the IDR it must have a refcount
422 * larger than 0 due to the guarantee in tee_shm_put() below. So
423 * it's safe to use refcount_inc().
424 */
484 if (!shm || shm->ctx != ctx)425 if (!shm || shm->ctx != ctx)
485 shm = ERR_PTR(-EINVAL);426 shm = ERR_PTR(-EINVAL);
486 else if (shm->flags & TEE_SHM_DMA_BUF)427 else
487 get_dma_buf(shm->dmabuf);428 refcount_inc(&shm->refcount);
488 mutex_unlock(&teedev->mutex);429 mutex_unlock(&teedev->mutex);
489 return shm;430 return shm;
490}431}
@@ -496,7 +437,24 @@ EXPORT_SYMBOL_GPL(tee_shm_get_from_id); · 5 unmodified lines
496 */437 */
497void tee_shm_put(struct tee_shm *shm)438void tee_shm_put(struct tee_shm *shm)
498{439{
499 if (shm->flags & TEE_SHM_DMA_BUF)440 struct tee_device *teedev = shm->ctx->teedev;
500 dma_buf_put(shm->dmabuf);441 bool do_release = false;
442
443 mutex_lock(&teedev->mutex);
444 if (refcount_dec_and_test(&shm->refcount)) {
445 /*
446 * refcount has reached 0, we must now remove it from the
447 * IDR before releasing the mutex. This will guarantee that
448 * the refcount_inc() in tee_shm_get_from_id() never starts
449 * from 0.
450 */
451 if (shm->flags & TEE_SHM_DMA_BUF)
452 idr_remove(&teedev->idr, shm->id);
453 do_release = true;
454 }
455 mutex_unlock(&teedev->mutex);
456
457 if (do_release)
458 tee_shm_release(teedev, shm);
501}459}
502EXPORT_SYMBOL_GPL(tee_shm_put);460EXPORT_SYMBOL_GPL(tee_shm_put);
include/linux/tee_drv.h+2−2
@@ -195,7 +195,7 @@ int tee_session_calc_client_uuid(uuid_t *uuid, u32 connection_method, · 194 unmodified lines
195 * @offset: offset of buffer in user space195 * @offset: offset of buffer in user space
196 * @pages: locked pages from userspace196 * @pages: locked pages from userspace
197 * @num_pages: number of locked pages197 * @num_pages: number of locked pages
198 * @dmabuf: dmabuf used to for exporting to user space198 * @refcount: reference counter
199 * @flags: defined by TEE_SHM_* in tee_drv.h199 * @flags: defined by TEE_SHM_* in tee_drv.h
200 * @id: unique id of a shared memory object on this device, shared200 * @id: unique id of a shared memory object on this device, shared
201 * with user space201 * with user space
@@ -214,7 +214,7 @@ struct tee_shm { · 12 unmodified lines
214 unsigned int offset;214 unsigned int offset;
215 struct page **pages;215 struct page **pages;
216 size_t num_pages;216 size_t num_pages;
217 struct dma_buf *dmabuf;217 refcount_t refcount;
218 u32 flags;218 u32 flags;
219 int id;219 int id;
220 u64 sec_world_id;220 u64 sec_world_id;