Skip to content

Commit fe7cdcd

Browse files
committed
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 parents 65c4ba8 + e19d7f7 commit fe7cdcd

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/tee/qcomtee/call.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ static void qcomtee_get_version(struct tee_device *teedev,
645645
static void qcomtee_get_qtee_feature_list(struct tee_context *ctx, u32 id,
646646
u32 *version)
647647
{
648-
struct qcomtee_object_invoke_ctx *oic __free(kfree);
648+
struct qcomtee_object_invoke_ctx *oic __free(kfree) = NULL;
649649
struct qcomtee_object *client_env, *service;
650650
struct qcomtee_arg u[3] = { 0 };
651651
int result;

drivers/tee/qcomtee/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void qcomtee_do_release_qtee_object(struct work_struct *work)
8282
{
8383
struct qcomtee_object *object;
8484
struct qcomtee *qcomtee;
85-
int ret, result;
85+
int ret, result = 0;
8686

8787
/* RELEASE does not require any argument. */
8888
struct qcomtee_arg args[] = { { .type = QCOMTEE_ARG_TYPE_INV } };

0 commit comments

Comments
 (0)