Commit Graph

256 Commits

Author SHA1 Message Date
songrui
a3040bbd65 securemsm-kernel: Enable smmu-proxy compilation
Resolve compilation issues related to printing
caused by kernel upgrade.

Change-Id: I34db6dab0af32b75d0877ae55e6a493004e11de9
Signed-off-by: songrui <quic_songrui@quicinc.com>
2023-11-10 10:19:29 +08:00
Santosh Dronamraju
320d8fa045 securemsm-kernel: Enable SMCINVOKE driver for HGY
Add flags for each feature and these flags to use
enable/disable features.

Enable SMCINVOKE driver and disable other drivers
on HGY platform.

Change-Id: I5eca4771aaa3001ecc0d8c06060c951923aa0619
Signed-off-by: Santosh Dronamraju <quic_sdronamr@quicinc.com>
2023-11-01 11:58:11 -07:00
Anmolpreet Kaur
77752c91fd securemsm: smcinvoke: Change zero length arrays to flexible arrays
In latest kernel upgrade Zero Length arrays are not allowed.
Replace with Flexible arrays.

Change-Id: Ide4ce5ac5f75197a432fb99333a702cdc4ff88c5
Signed-off-by: Anmolpreet Kaur <quic_anmolpre@quicinc.com>
2023-10-20 20:32:07 +05:30
qctecmdr
026f1690e3 Merge "securemsm-kernel: Compile sec-module-symvers conditionally" 2023-10-16 21:17:00 -07:00
Anmolpreet Kaur
8f9a7a029a securemsm-kernel: Compile sec-module-symvers conditionally
Compile sec-module-symvers only if at least  one of the
ENABLE_SECUREMSM_QTEE_DLKM or ENABLE_SECUREMSM_DLKM is true.

Change-Id: Ibf69d19ef311d02862f8a87dabd01875ae2cdcab
Signed-off-by: Anmolpreet Kaur <quic_anmolpre@quicinc.com>
2023-10-12 09:35:03 -07:00
qctecmdr
7c7cc79348 Merge "securemsm-kernel: Add support for Bazel for niobe" 2023-10-12 00:18:05 -07:00
qctecmdr
fdeef9c344 Merge "securemsm-kernel: enable non-qtee modules" 2023-10-06 23:40:40 -07:00
qctecmdr
77139b8b34 Merge "securemsm-kernel: Fix compilation errors" 2023-10-05 17:38:58 -07:00
qctecmdr
65bfc927ea Merge "securemsm-kernel: change the CMO's clean and flush" 2023-10-04 22:53:14 -07:00
qctecmdr
039380b55c Merge "qseecom: check for state first before performing ioctl" 2023-10-04 22:53:14 -07:00
Gaurav Kashyap
154b6011b0 securemsm-kernel: enable non-qtee modules
Fix compilation issues and enable all modules bound
by TARGET_KERNEL_DLKM_SECURE_MSM_OVERRIDE.

Change-Id: Id8e2d5ecb580d5fd200fe5e5e899202046136976
Signed-off-by: Gaurav Kashyap <quic_gaurkash@quicinc.com>
2023-10-04 11:50:16 -07:00
Anmolpreet Kaur
61706292b1 securemsm-kernel: Fix compilation errors
kernel-qcom 6.1 has some changes in api definations
and header file locations. This change fixes compilation
errors related to those changes.

Change-Id: I6162ffe9e671a8e94d80e9ec01839566c617aa03
Signed-off-by: Anmolpreet Kaur <quic_anmolpre@quicinc.com>
2023-09-29 17:17:48 -07:00
Nitin LNU
88d0774828 qseecom: check for state first before performing ioctl
Before initating the ioctl lets first check the state of qseecom
is yet ready or not.

Test:
1. L0 Validation
2. Introduced a sleep in init path and tested the qseecom node.

Change-Id: Ic93ab91a4281ff615b629fdeb936fcd924589b5d
Signed-off-by: Nitin LNU <quic_nlakra@quicinc.com>
2023-09-29 07:34:21 -07:00
Nitin LNU
f0c078a367 qseecom: Change the clean and invalidation way for dmabuf
dmabuf having the changes in 6.1 for clean and invalidate ,
made similar changes to do invalidation and clean in
qseecom corresponding to dmabuf changes.

Change-Id: I23a9686ce4902d86c8ef60c099fcc4394356e114
Signed-off-by: Nitin LNU <quic_nlakra@quicinc.com>
2023-09-28 07:49:30 -07:00
Seshu Madhavi Puppala
3561b03e10 securemsm-kernel: Add support for Bazel for niobe
Add support for Bazel for niobe.

Change-Id: Id04b39ed3b863aca923ec924a7d0ccb01cab421f
Signed-off-by: Seshu Madhavi Puppala <quic_spuppala@quicinc.com>
2023-09-25 02:32:21 -07:00
Nitin LNU
c5627e0e69 securemsm-kernel: change the CMO's clean and flush
Change DMA HEAP CMO's clean and flush as per changes
for 6.1 kernel.

Change-Id: Ie36fc1efdeecd1ab1afd3d9a59372b762bb8ad0d
Signed-off-by: Nitin LNU <quic_nlakra@quicinc.com>
2023-09-22 03:49:08 -07:00
Sheik Anwar Shabic Y
c363344909 securemsm-kernel: Fix misra issues in hdcp driver
Initialized the uninitialized variable to prevent potential errors.

Change-Id: I2fc05486a246fe3c05997b24587638928a0769ec
Signed-off-by: Sheik Anwar Shabic Y <quic_sheikanw@quicinc.com>
2023-09-22 14:42:25 +05:30
qctecmdr
f5557b6e65 Merge "securemsm-kernel: Add rules to build qtee modules on sun" 2023-09-20 02:06:53 -07:00
qctecmdr
bf4015d2f7 Merge "securemsm-kernel: qseecom: remove ion.h header include" 2023-09-19 14:43:12 -07:00
Anmolpreet Kaur
e22a42f5fe securemsm-kernel: Add rules to build qtee modules on sun
Add changes to support compilation and enablement for
qtee modules on sun. These changes do not enable the
compilation but add a support to enable the driver
compilation just by setting ENABLE_SECUREMSM_QTEE_DLKM to true.

1. Flag ENABLE_SECUREMSM_QTEE_DLKM ensures that we can
enable compilation and enablement of smcinvoke,tzlog and qseecom
driver irrespective of high level KERNEL_DLKM* flags.
2. BUILD.bazel and build/sun.bzl changes to enable bazel
configurations for smcinvoke and tzlog driver once they are enabled
in Android.mk.

Change-Id: I5574c4b328266c3344aac435d034e6639a05fb12
Signed-off-by: Anmolpreet Kaur <quic_anmolpre@quicinc.com>
2023-09-19 23:02:36 +05:30
qctecmdr
a3aa2b7dc0 Merge "qrng: fix module remove sequence" 2023-09-14 20:14:51 -07:00
qctecmdr
1a392c58fd Merge "qcedev: Fix null-ptr-deref in qcedev_cipher_req_cb" 2023-09-13 14:20:49 -07:00
qctecmdr
dea84289f9 Merge "Fix for StsHostTestCases (CVE_2016_6752) failure" 2023-09-13 09:53:07 -07:00
Om Prakash Singh
d374955003 qrng: fix module remove sequence
Module remove call is not cleaning up char dev completely.

Update remove call sequence to call class_destroy, device_destroy
and cdev_del to clean up char dev complexly.

Change-Id: I07f28c27ac0ca78cb8223118bd0be3b3a5654224
Signed-off-by: Om Prakash Singh <quic_omprsing@quicinc.com>
2023-09-13 20:26:53 +05:30
Anmolpreet Kaur
ec134edd3b securemsm-kernel: qseecom: remove ion.h header include
ion is deprecated now. Removing header as it is no longer
needed.

Test:
Tested compilation on sun and pineapple builds.

Change-Id: Ic67d389b7161e7c1daade147a719140456156ca3
Signed-off-by: Anmolpreet Kaur <quic_anmolpre@quicinc.com>
2023-09-12 06:34:34 -07:00
qctecmdr
dc7a556fa0 Merge "sec-kernel: Enable LV securemsmdlkm" 2023-09-11 07:45:19 -07:00
kodanda rami reddy v
f93cb74fda Fix for StsHostTestCases (CVE_2016_6752) failure
StsHostTestCases-android.security.sts.Poc16_11#testPocCVE_2016_6752 is
failed due to assertion error due to address pattern.

Change-Id: Id1bdf0637ac9ee1bc493e87147128153faaed546
Signed-off-by: kodanda rami reddy v <quic_kreddyv@quicinc.com>
2023-09-10 19:56:10 -07:00
qctecmdr
5c778942e7 Merge "securemsm-kernel: Fix format-specifier errors" 2023-09-06 21:07:39 -07:00
Anmolpreet Kaur
2e42ca628b securemsm-kernel: Fix format-specifier errors
Moving to a new kernel version has led to
enablement of new compiler warnings. These
issues came during compilation enablement
of securemsm modules for sun.

Change-Id: Id807a642b9465dda79680c28d4a6eeef64a45eba
Signed-off-by: Anmolpreet Kaur <quic_anmolpre@quicinc.com>
2023-09-05 08:53:17 -07:00
jianshu
cee3f2165c sec-kernel: Enable LV securemsmdlkm
The clean command will clear the KERNEL_SRC path, then cause
securemsmdlkm compile fail.

Change-Id: I3b956f87b2d46d21399104796ac5f7d2a5521cbd
Signed-off-by: jianshu <quic_jianshu@quicinc.com>
2023-09-04 23:35:06 -07:00
Amirreza Zarrabi
73d246b23b securemsm-kernel: smcinvoke: Add missing unlock on function return
Also reset the output buffer after processing.

Change-Id: Ib8d9b3ffe4c25c3c699df561d7f37776a8fcd538
Signed-off-by: Amirreza Zarrabi <quic_azarrabi@quicinc.com>
2023-09-04 22:07:01 -07:00
qctecmdr
0876cca974 Merge "securemsm-kernel: Fixed multiple listener registration on same fd" 2023-09-04 02:45:24 -07:00
qctecmdr
2f83bab3e0 Merge "securemsm-kernel: Add framework to piggy back for call back" 2023-09-04 00:31:29 -07:00
Udit Tiwari
48d10387ac qcedev: Fix null-ptr-deref in qcedev_cipher_req_cb
adding missing NULL check for qcedev_areq in
qcedev_offload_cipher_req_cb and qcedev_cipher_req_cb.

Change-Id: Ibbb037b12b1c6264376fe1f3185bd0b392447a65
Signed-off-by: Udit Tiwari <quic_utiwari@quicinc.com>
2023-08-31 13:02:53 +05:30
qctecmdr
e43059f322 Merge "securemsm-kernel: fix smcinvoke dependency" 2023-08-30 00:51:19 -07:00
qctecmdr
ae7eb3e1c9 Merge "pineapple:Fix smcinvoke_dlkm.ko dependency error when DLKM is enabled" 2023-08-30 00:51:19 -07:00
Xhoendi Collaku
cd59be71f8 pineapple:Fix smcinvoke_dlkm.ko dependency error when DLKM is enabled
Adding conditional check in securemsm_kernel_vendor_board.mk.

Change-Id: Icf7fe1f03ff7016381f5fdbc81946d799169c5b6
Signed-off-by: Xhoendi Collaku <quic_xcollaku@quicinc.com>
2023-08-28 15:55:42 -07:00
Chris Goldsworthy
009ea1b0a5 smmu-proxy: Correctly allow a DMA-BUF to be mapped as RW
mem_buf_retrieve() is what will actually create a DMA-BUF, along with
the struct file that underpins the DMA-BUF's lifetime and user space
interface. The FD RWX permissions are set during this time, and
currently, we just supply a flags value of 0, corresponding to
read-only. Set the file permissions as O_RDWR accordingly.

Separately, dma_buf_fd(), which just exposes a DMA-BUF's struct file
to user space, ignores all other arguments other than O_CLOEXEC, so
discard the other arguments.

Change-Id: I5e81909f3b87edb28cbbb087ec1994004fd82e45
Signed-off-by: Chris Goldsworthy <quic_cgoldswo@quicinc.com>
2023-08-25 13:41:35 -07:00
Nitin LNU
3eda31424a securemsm-kernel: Add framework to piggy back for call back
Add framework for piggy back of mo at time of callback too.

TEST Cases:
1. Ran GP TEST cases with MO for 5 hours.
2. L0 testing done.
3. Added new test for same in tzecotest load app.

Change-Id: I4d0d0b30303264f105f976109d44ca03159b970c
Signed-off-by: Nitin LNU <quic_nlakra@quicinc.com>
2023-08-24 05:58:24 -07:00
Reut Zysman
a0b09e0715 securemsm-kernel: fix smcinvoke dependency
For hdcp and smmu, include smcinvoke_object.h
instead of smcinvoke.h.

Change-Id: Ieab17cfe70b779bd19d7596a3057e6d6c530b997
Signed-off-by: Reut Zysman <quic_rzysman@quicinc.com>
2023-08-23 21:32:02 -07:00
qctecmdr
8f1ef6a771 Merge "securemsm-kernel: remove qcedev_compat support" 2023-08-22 14:17:25 -07:00
qctecmdr
6b2e851182 Merge "securemsm-kernel: smcinvoke: add forward declaration" 2023-08-19 22:36:38 -07:00
Udit Tiwari
f214d2e6b8 securemsm-kernel: remove qcedev_compat support
cleanup qcedev_compat driver support that is not
needed on latest Qualcomm Technologies, Inc. plateforms.

Change-Id: Id61e06a5a3cc1b3e9474c328f26761ffda9a55e0
Signed-off-by: Udit Tiwari <quic_utiwari@quicinc.com>
2023-08-17 21:29:26 -07:00
Anmolpreet Kaur
e2e161b34c securemsm-kernel: smcinvoke: Release map objs if invoke call fails
This change is a correction on top of commit: b1c6f1e9
which provided the fix for same issue but had a catch.
In the previous change, kref_put was being done on an
empty list. This change fixes that issue and deletes the
list after kref_put is done.

Root cause of original issue:
If invoke call fails due to some reason, map objects created
for memory objects should also be released. Failing to do so,
creates a memory leak as TZ is unaware of these objects and
no one calls release on these.

Change-Id: Ibad583f6c45fbed05539757eb50a39289d532328
Signed-off-by: Anmolpreet Kaur <quic_anmolpre@quicinc.com>
2023-08-17 19:46:33 -07:00
Pawan Rai
00266e4044 securemsm-kernel: Fixed multiple listener registration on same fd
Added check to prevent more than one listener registration
on a fd. This could lead to potential vulnerabilities of use
after free while unregistering the listener.

Change-Id: Ia2973853943b5619bcf2047629b9c193f6a8c5cf
Signed-off-by: Pawan Rai <quic_pawarai@quicinc.com>
2023-08-17 09:08:51 -07:00
qctecmdr
f20c65ab0e Merge "smmu-proxy: Change location of UAPI directory" 2023-08-15 14:27:42 -07:00
Reut Zysman
60fd58f999 securemsm-kernel: smcinvoke: add forward declaration
Add a forward declaration to avoid compilation errors.

Change-Id: I2b72059a6f739cc89c2da255bba736a2b4a1402a
Signed-off-by: Reut Zysman <quic_rzysman@quicinc.com>
2023-08-09 23:54:33 -07:00
Sheik Anwar Shabic Y
5b4eba2697 securemsm-kernel : Add validation check for shm handle release call
1.Invalid shm handle release causing in to invalid address access.
  so added check to release the handle only if it is valid.
2.Skip the error if hdcpsrm ta loading is failing with already
  loaded error becase hdcpsrm can be loaded from wfd stack
  also when external monior is connected with sink device.

Change-Id: Ic6c48eabfc383352e8de781bebbc2e6cd7e964e0
Signed-off-by: Sheik Anwar Shabic Y <quic_sheikanw@quicinc.com>
2023-08-02 15:36:35 +05:30
qctecmdr
ae47124ef5 Merge "securemsm-kernel: Add reboot notifier for resource cleanup at reboot" 2023-08-01 13:04:00 -07:00
qctecmdr
a81e34e070 Merge "securemsm-kernel: smcinvoke: Fix mapping requests log" 2023-08-01 10:48:01 -07:00