Jens Wiklander 4c34a4e473
BACKPORT: tee: handle lookup of shm with reference count 0 ...
commit dfd0743f1d9ea76931510ed150334d571fbab49d upstream.
Since the tee subsystem does not keep a strong reference to its idle
shared memory buffers, it races with other threads that try to destroy a
shared memory through a close of its dma-buf fd or by unmapping the
memory.
In tee_shm_get_from_id() when a lookup in teedev->idr has been
successful, it is possible that the tee_shm is in the dma-buf teardown
path, but that path is blocked by the teedev mutex. Since we don't have
an API to tell if the tee_shm is in the dma-buf teardown path or not we
must find another way of detecting this condition.
Fix this by doing the reference counting directly on the tee_shm using a
new refcount_t refcount field. dma-buf is replaced by using
anon_inode_getfd() instead, this separates the life-cycle of the
underlying file from the tee_shm. tee_shm_put() is updated to hold the
mutex when decreasing the refcount to 0 and then remove the tee_shm from
teedev->idr before releasing the mutex. This means that the tee_shm can
never be found unless it has a refcount larger than 0.
Fixes: 967c9cca2cc5 ("tee: generic TEE subsystem")
Cc: stable@vger.kernel.org
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Reviewed-by: Lars Persson <larper@axis.com >
Reviewed-by: Sumit Garg <sumit.garg@linaro.org >
Reported-by: Patrik Lantz <patrik.lantz@axis.com >
[JW: backport to 5.4-stable]
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Lee Jones <lee.jones@linaro.org >
[mkbestas: backport to 4.9]
Signed-off-by: Michael Bestas <mkbestas@lineageos.org >
Change-Id: Ibd2809a225b167563c65faff4a44e56e23c2e97b
2025-06-18 10:14:18 +02:00
2022-06-25 11:45:01 +02:00
2023-01-07 12:07:10 +01:00
2019-09-10 10:31:03 +01:00
2017-12-16 12:33:02 +05:30
2021-06-14 17:32:34 +08:00
2018-08-24 13:12:40 +02:00
2019-12-05 15:34:25 +01:00
2019-07-26 21:29:11 +08:00
2019-05-09 12:23:05 +08:00
2018-05-10 00:13:37 +05:30
2022-07-29 17:05:45 +02:00
2018-04-13 19:48:19 +02:00
2022-03-16 12:49:00 +01:00
2019-01-25 20:29:29 +08:00
2022-08-09 06:05:50 +03:00
2021-08-03 16:41:39 +08:00
2018-10-13 09:18:58 +02:00
2018-04-26 11:16:45 -07:00
2020-04-24 18:27:47 +08:00
2021-10-27 08:45:10 +00:00
2020-06-30 15:38:42 -04:00
2018-05-24 08:48:09 -05:00
2020-04-24 18:27:47 +08:00
2021-01-08 15:04:03 +08:00
2018-02-26 23:47:34 -08:00
2021-08-03 16:41:39 +08:00
2021-02-23 13:59:14 +01:00
2022-09-06 06:11:26 +03:00
2021-01-23 15:38:17 +01:00
2020-01-12 11:24:13 +01:00
2022-05-09 16:57:36 +03:00
2022-10-26 13:15:43 +02:00
2019-12-21 10:41:44 +01:00
2023-01-15 16:23:04 +02:00
2019-07-02 15:35:29 +08:00
2021-03-12 14:56:50 +08:00
2018-05-02 17:19:36 +05:30
2020-05-13 19:01:51 +00:00
2020-01-29 10:24:41 +01:00
2020-06-30 15:38:29 -04:00
2019-04-17 08:36:46 +02:00
2019-05-14 19:19:34 +02:00
2018-10-26 20:10:38 +08:00
2021-01-08 15:04:03 +08:00
2023-04-28 20:41:36 +03:00
2020-05-20 08:15:31 +02:00
2018-12-08 13:05:10 +01:00
2019-12-12 15:48:18 -08:00
2022-08-25 12:09:51 +02:00
2022-09-15 12:39:45 +02:00
2022-01-11 15:21:18 +01:00
2022-01-11 13:38:12 +01:00
2020-10-20 17:40:55 +08:00
2018-01-31 12:55:51 +01:00
2020-05-20 08:15:32 +02:00
2020-01-04 13:39:17 +01:00
2018-02-28 15:09:58 -08:00
2023-04-09 11:18:57 +03:00
2023-04-09 11:18:57 +03:00
2018-02-07 10:37:41 -08:00
2017-12-16 12:33:02 +05:30
2017-12-16 12:33:02 +05:30
2018-01-24 16:34:44 -07:00
2019-02-27 10:07:01 +01:00
2019-08-06 18:29:38 +02:00
2019-08-06 18:29:38 +02:00
2020-05-17 18:58:16 +00:00
2021-02-03 23:19:49 +01:00
2019-02-12 15:04:28 +01:00
2022-03-11 10:03:32 +01:00
2019-01-31 08:12:35 +01:00
2021-11-24 03:35:01 +00:00
2021-05-26 11:29:08 +02:00
2021-12-29 06:56:04 +00:00
2018-02-02 11:02:24 +08:00
2022-06-16 13:05:12 +02:00
2019-11-25 09:52:44 +01:00
2019-03-08 11:22:00 -08:00
2019-03-14 13:45:04 -07:00
2022-08-09 06:05:50 +03:00
2023-01-15 16:22:29 +02:00
2018-08-24 23:21:41 -07:00
2021-10-06 10:23:43 +02:00
2018-12-18 20:49:12 -08:00
2018-02-28 10:18:33 +01:00
2019-08-19 17:26:48 +00:00
2020-11-26 18:08:27 +08:00
2019-03-22 14:08:39 -07:00
2020-06-01 11:03:38 +08:00
2018-04-11 13:28:37 -07:00
2020-10-20 17:40:55 +08:00
2021-09-14 11:41:13 +08:00
2018-05-17 12:11:57 +05:30
2019-01-23 18:58:17 -08:00
2018-09-20 18:54:56 -07:00
2018-04-11 18:16:06 +00:00
2022-06-25 11:45:19 +02:00
2020-01-12 11:24:13 +01:00
2022-10-26 13:15:43 +02:00
2017-11-27 18:17:03 -08:00
2019-11-25 09:52:59 +01:00
2021-03-11 13:48:03 +01:00
2020-09-03 11:21:19 +02:00
2018-11-10 07:42:48 -08:00
2021-10-27 09:34:00 +02:00
2020-06-30 15:38:29 -04:00
2022-04-27 13:14:10 +02:00
2023-01-07 12:07:15 +01:00
2018-08-10 02:54:34 -07:00
2019-05-24 17:00:58 +00:00
2019-12-17 13:25:36 +08:00
2018-02-13 12:36:00 +01:00
2017-12-10 17:14:07 +01:00
2021-12-29 06:56:04 +00:00
2021-12-29 06:56:04 +00:00
2020-10-14 09:48:14 +02:00
2018-01-17 09:38:58 +01:00
2020-01-21 11:28:26 -08:00
2023-04-09 11:25:03 +03:00
2018-01-10 09:29:52 +01:00
2020-05-13 19:01:51 +00:00
2018-03-28 18:39:23 +02:00
2018-02-02 19:49:15 -08:00
2018-04-26 21:50:58 +00:00
2021-02-23 14:46:12 +01:00
2021-02-03 23:19:50 +01:00
2019-12-05 15:35:02 +01:00
2020-06-30 15:38:32 -04:00
2019-02-12 19:44:56 +01:00
2019-11-22 13:47:52 +08:00
2018-11-14 10:02:11 +00:00
2019-09-10 10:31:00 +01:00
2018-02-09 13:59:19 -08:00
2019-02-15 08:07:39 +01:00
2021-12-14 10:35:14 +01:00
2023-06-20 14:35:29 +03:00
2020-11-10 10:24:00 +01:00
2020-02-14 10:56:19 +08:00
2018-11-09 23:02:09 +00:00
2021-09-22 11:43:08 +02:00
2022-06-25 11:45:10 +02:00
2020-09-23 08:46:15 +02:00
2018-11-21 09:26:01 +01:00
2021-03-03 17:44:46 +01:00
2020-09-12 11:47:36 +02:00
2021-03-30 14:41:41 +02:00
2020-06-01 11:03:38 +08:00
2020-01-12 11:24:25 +01:00
2021-03-30 14:41:40 +02:00
2019-08-11 15:30:44 +02:00
2020-12-11 13:37:58 +01:00
2018-01-10 19:42:37 -07:00
2018-10-17 08:17:42 -07:00
2018-10-17 08:17:42 -07:00
2021-01-23 15:38:17 +01:00
2018-12-01 09:44:26 +01:00
2021-02-03 23:19:51 +01:00
2018-03-19 04:18:31 -07:00
2020-07-31 16:44:05 +02:00
2018-04-11 18:16:06 +00:00
2018-05-24 08:48:09 -05:00
2018-01-24 16:21:04 -08:00
2018-03-05 22:34:59 -08:00
2018-05-24 08:48:09 -05:00
2018-04-19 17:20:26 -07:00
2021-12-08 08:45:05 +01:00
2018-07-17 23:29:18 +00:00
2021-04-26 16:09:53 +08:00
2019-07-02 15:35:29 +08:00
2019-12-21 10:41:37 +01:00
2018-10-10 08:53:18 +02:00
2018-02-22 15:43:55 +01:00
2019-05-08 07:46:34 +02:00
2018-11-23 08:20:35 +01:00
2018-05-30 07:50:26 +02:00
2017-12-18 15:21:35 -08:00
2021-01-09 13:35:50 +01:00
2023-01-15 16:22:32 +02:00
2019-03-22 14:15:31 -07:00
2022-07-02 16:17:16 +02:00
2017-11-27 18:16:28 -08:00
2018-12-04 10:24:40 +08:00
2018-12-04 10:24:40 +08:00
2020-06-20 10:24:16 +02:00
2020-10-14 09:48:17 +02:00
2023-06-20 14:35:29 +03:00
2020-01-14 20:04:25 +01:00
2021-12-08 08:45:06 +01:00
2021-01-05 16:00:48 +00:00
2023-06-20 14:35:29 +03:00
2018-01-22 15:58:17 +05:30
2021-11-26 11:48:18 +01:00
2020-01-04 13:41:02 +01:00
2019-06-11 12:22:42 +02:00
2020-02-28 15:42:30 +01:00
2023-06-20 14:35:29 +03:00
2023-06-20 14:35:29 +03:00
2020-10-20 17:40:55 +08:00
2022-07-29 18:58:19 +02:00
2023-01-15 16:23:04 +02:00
2023-06-20 14:47:12 +03:00
2021-10-09 13:25:58 +02:00
2018-02-07 02:30:22 -08:00
2021-03-12 14:56:50 +08:00
2019-11-28 18:28:51 +01:00
2022-06-25 11:45:10 +02:00
2020-10-06 16:40:47 -07:00
2018-06-11 00:33:47 -07:00
2019-11-14 14:28:42 +08:00
2023-06-20 14:35:29 +03:00
2017-12-20 10:07:29 +01:00
2021-07-11 12:46:40 +02:00
2017-12-14 09:28:16 +01:00
2020-09-09 11:45:07 +08:00
2020-07-10 11:46:20 +08:00
2022-05-09 16:57:36 +03:00
2018-02-28 15:09:58 -08:00
2021-08-26 08:37:24 -04:00
2017-12-01 16:53:39 -08:00
2018-05-02 14:53:48 -07:00
2018-01-13 12:45:28 -08:00
2020-07-17 06:05:05 +00:00
2018-02-09 13:59:19 -08:00
2018-02-10 03:43:20 -08:00
2017-11-29 10:52:52 +05:30
2017-12-18 21:32:49 -08:00
2018-03-27 18:44:10 +05:30
2022-06-25 11:44:58 +02:00
2022-05-18 09:15:42 +02:00
2022-05-09 16:57:36 +03:00
2022-06-14 16:52:40 +02:00
2018-05-22 16:58:02 +02:00
2021-03-01 15:00:57 +00:00
2017-12-14 09:28:16 +01:00
2022-06-25 11:44:58 +02:00
2023-06-20 14:49:17 +03:00
2020-10-29 10:17:40 +01:00
2020-05-27 16:41:52 +02:00
2019-11-14 14:28:42 +08:00
2021-08-18 20:51:10 +08:00
2023-06-20 14:47:12 +03:00
2022-08-25 11:09:24 +02:00
2018-02-25 11:05:51 +01:00
2021-09-22 11:43:10 +02:00
2020-04-24 07:59:12 +02:00
2018-01-05 15:46:35 +01:00
2021-01-25 15:50:07 +08:00
2019-08-16 17:31:48 +00:00
2018-12-01 09:44:25 +01:00
2020-03-20 09:07:43 +01:00
2019-09-03 13:45:29 -07:00
2019-06-11 12:22:45 +02:00
2020-05-20 08:15:36 +02:00
2020-01-23 08:19:33 +01:00
2020-05-20 08:15:32 +02:00
2018-11-10 07:43:01 -08:00
2020-03-17 19:03:53 +08:00
2022-06-25 11:45:14 +02:00
2019-09-03 13:43:55 -07:00
2019-03-23 13:19:50 +01:00
2018-04-20 08:21:05 +02:00
2023-06-20 14:49:17 +03:00
2023-06-20 14:49:17 +03:00
2018-06-21 04:44:09 +00:00
2019-01-09 16:16:42 +01:00
2022-06-14 16:52:28 +02:00
2019-07-26 21:29:11 +08:00
2018-10-29 02:09:21 -07:00
2018-05-24 08:48:09 -05:00
2020-01-04 13:40:50 +01:00
2019-12-21 10:42:08 +01:00
2018-04-09 16:11:59 -07:00
2022-08-09 06:05:50 +03:00
2022-07-02 16:17:14 +02:00
2022-01-27 08:47:42 +01:00
2022-01-27 08:47:42 +01:00
2020-02-28 15:42:30 +01:00
2018-09-21 15:09:04 -07:00
2019-08-04 09:33:19 +02:00
2019-03-04 15:23:37 +08:00
2019-04-05 22:29:06 +02:00
2019-12-05 15:34:07 +01:00
2018-12-08 13:05:09 +01:00
2018-04-24 13:28:12 -07:00
2018-10-18 09:13:25 +02:00
2019-04-05 22:29:05 +02:00
2022-09-06 06:11:26 +03:00
2023-05-14 16:49:42 +03:00
2018-12-17 20:00:56 +00:00
2017-11-30 14:49:45 -08:00
2018-05-22 16:58:01 +02:00
2022-07-29 18:58:19 +02:00
2020-04-02 17:20:39 +02:00
2020-12-29 13:44:59 +01:00
2020-10-01 20:40:04 +02:00
2022-09-28 11:12:52 +02:00
2023-06-20 14:35:29 +03:00
2018-01-17 09:38:53 +01:00
2021-12-08 08:45:05 +01:00
2020-01-29 10:24:30 +01:00
2022-06-25 11:45:14 +02:00
2022-09-06 05:54:37 +03:00
2018-10-03 17:01:50 -07:00
2019-05-31 06:48:17 -07:00
2023-01-15 16:23:02 +02:00
2018-08-24 23:21:41 -07:00
2018-03-19 14:33:58 +05:30
2022-06-25 11:45:14 +02:00
2023-06-20 14:47:12 +03:00
2023-06-20 14:47:12 +03:00
2018-09-27 15:02:48 -07:00
2021-06-30 08:49:13 -04:00
2018-05-14 16:15:00 +00:00
2018-03-19 14:33:58 +05:30
2019-09-03 13:45:40 -07:00
2018-09-27 15:02:48 -07:00
2021-03-07 11:40:25 +01:00
2018-10-22 16:20:18 +08:00
2018-11-13 11:17:02 -08:00
2022-10-26 13:28:31 +02:00
2025-06-18 10:14:18 +02:00
2023-01-15 16:22:27 +02:00
2021-03-24 11:32:14 +01:00
2020-11-18 18:26:23 +01:00
2019-12-21 10:42:25 +01:00
2017-11-29 13:44:16 -08:00
2018-01-18 07:01:08 -08:00
2023-01-07 12:07:13 +01:00
2022-06-25 11:45:13 +02:00
2020-02-14 10:56:19 +08:00
2020-12-29 13:44:59 +01:00
2020-08-21 11:01:56 +02:00
2021-05-22 10:40:24 +02:00
2022-07-29 17:05:47 +02:00
2020-12-11 13:38:00 +01:00
2021-03-30 14:41:39 +02:00
2020-10-20 17:40:55 +08:00
2018-05-24 08:48:09 -05:00
2022-10-22 03:50:16 +03:00
2022-06-25 11:45:10 +02:00
2018-09-10 09:20:19 +02:00
2018-01-31 12:55:52 +01:00
2019-04-17 08:36:47 +02:00
2021-03-25 02:06:20 +00:00
2018-05-01 15:13:05 -07:00
2018-12-18 19:45:42 -08:00
2018-11-01 12:45:14 +08:00
2023-06-20 14:35:29 +03:00
2019-07-21 09:06:03 +02:00
2020-04-02 17:20:39 +02:00
2021-12-14 10:04:48 +01:00
2019-04-09 14:28:30 -07:00
2018-10-08 14:11:55 +05:30
2022-06-25 11:45:09 +02:00
2019-03-22 14:06:39 -07:00
2020-08-21 11:01:55 +02:00
2018-08-23 12:05:06 -07:00
2021-03-07 11:40:25 +01:00
2018-08-23 12:05:06 -07:00
4c34a4e473