Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'qcomtee-fixes2-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into arm/fixes

QCOMTEE fixes2 for v6.18

- initialize result before use in in error path
- fix uninitialized pointers with free attribute

* tag 'qcomtee-fixes2-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee:
tee: qcomtee: initialize result before use in release worker
tee: qcomtee: fix uninitialized pointers with free attribute

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+2 -2
+1 -1
drivers/tee/qcomtee/call.c
··· 645 645 static void qcomtee_get_qtee_feature_list(struct tee_context *ctx, u32 id, 646 646 u32 *version) 647 647 { 648 - struct qcomtee_object_invoke_ctx *oic __free(kfree); 648 + struct qcomtee_object_invoke_ctx *oic __free(kfree) = NULL; 649 649 struct qcomtee_object *client_env, *service; 650 650 struct qcomtee_arg u[3] = { 0 }; 651 651 int result;
+1 -1
drivers/tee/qcomtee/core.c
··· 82 82 { 83 83 struct qcomtee_object *object; 84 84 struct qcomtee *qcomtee; 85 - int ret, result; 85 + int ret, result = 0; 86 86 87 87 /* RELEASE does not require any argument. */ 88 88 struct qcomtee_arg args[] = { { .type = QCOMTEE_ARG_TYPE_INV } };