Unverified Commit fe7cdcd1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcomtee-fixes2-for-6.18' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 65c4ba83 e19d7f7e

drivers/tee/qcomtee/call.c

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static void qcomtee_get_version(struct tee_device *teedev, 
static void qcomtee_get_qtee_feature_list(struct tee_context *ctx, u32 id,

					  u32 *version)

{

	struct qcomtee_object_invoke_ctx *oic __free(kfree);

	struct qcomtee_object_invoke_ctx *oic __free(kfree) = NULL;

	struct qcomtee_object *client_env, *service;

	struct qcomtee_arg u[3] = { 0 };

	int result;

drivers/tee/qcomtee/core.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void qcomtee_do_release_qtee_object(struct work_struct *work) 
{

	struct qcomtee_object *object;

	struct qcomtee *qcomtee;

	int ret, result;

	int ret, result = 0;



	/* RELEASE does not require any argument. */

	struct qcomtee_arg args[] = { { .type = QCOMTEE_ARG_TYPE_INV } };