lkml.org 
[lkml]   [2023]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
SubjectRe: [PATCH] tee: optee: smc_abi: Fix use-after-free in optee_smc_open
I fix the errors in the previous patch.

From 2046cc19aeaddb5f6fb5e9b1d9a380a116892657 Mon Sep 17 00:00:00 2001
From: Yoochan Lee <yoochan1026@gmail.com>
Date: Mon, 2 Jan 2023 09:18:23 +0900
Subject: [PATCH 2/2] fix errors in previous patch

---
drivers/tee/optee/smc_abi.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index 4fbec2acc255..be662f263f29 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1103,12 +1103,7 @@ static void optee_smc_release_supp(struct
tee_context *ctx)
{
struct optee *optee = tee_get_drvdata(ctx->teedev);

- optee_release_helper(ctx, optee_close_session_helper);
- if (optee->scan_bus_wq) {
- destroy_workqueue(optee->scan_bus_wq);
- optee->scan_bus_wq = NULL;
- }
- optee_supp_release(&optee->supp);
+ optee_release_supp(ctx)
kref_put(&optee->refcnt, optee_smc_delete);
}

@@ -1116,7 +1111,7 @@ static void optee_smc_release(struct tee_context *ctx)
{
struct optee *optee = tee_get_drvdata(ctx->teedev);

- optee_release_helper(ctx, optee_close_session_helper);
+ optee_release(ctx);
kref_put(&optee->refcnt, optee_smc_delete);
}

--
2.39.0
2023년 1월 2일 (월) 오전 6:43, kernel test robot <lkp@intel.com>님이 작성:
>
> Hi Yoochan,
>
> Thank you for the patch! Yet something to improve:
>
> [auto build test ERROR on linus/master]
> [also build test ERROR on v6.2-rc1 next-20221226]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch#_base_tree_information]
>
> url: https://github.com/intel-lab-lkp/linux/commits/Yoochan-Lee/tee-optee-smc_abi-Fix-use-after-free-in-optee_smc_open/20221231-132046
> patch link: https://lore.kernel.org/r/20221231051954.2038772-1-yoochan1026%40gmail.com
> patch subject: [PATCH] tee: optee: smc_abi: Fix use-after-free in optee_smc_open
> config: arm-randconfig-c002-20221231
> compiler: clang version 16.0.0 (https://github.com/llvm/llvm-project f5700e7b69048de958172fb513b336564e7f8709)
> reproduce (this is a W=1 build):
> wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # install arm cross compiling tool for clang build
> # apt-get install binutils-arm-linux-gnueabi
> # https://github.com/intel-lab-lkp/linux/commit/6d3d5f78a2463a577c1a908cdedda61affba9c01
> git remote add linux-review https://github.com/intel-lab-lkp/linux
> git fetch --no-tags linux-review Yoochan-Lee/tee-optee-smc_abi-Fix-use-after-free-in-optee_smc_open/20221231-132046
> git checkout 6d3d5f78a2463a577c1a908cdedda61affba9c01
> # save the config file
> mkdir build_dir && cp config build_dir/.config
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm olddefconfig
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/tee/optee/
>
> If you fix the issue, kindly add following tag where applicable
> | Reported-by: kernel test robot <lkp@intel.com>
>
> All errors (new ones prefixed by >>):
>
> >> drivers/tee/optee/smc_abi.c:1106:2: error: call to undeclared function 'optee_release_helper'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
> optee_release_helper(ctx, optee_close_session_helper);
> ^
> drivers/tee/optee/smc_abi.c:1106:2: note: did you mean 'optee_release_supp'?
> drivers/tee/optee/optee_private.h:258:6: note: 'optee_release_supp' declared here
> void optee_release_supp(struct tee_context *ctx);
> ^
> drivers/tee/optee/smc_abi.c:1119:2: error: call to undeclared function 'optee_release_helper'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
> optee_release_helper(ctx, optee_close_session_helper);
> ^
> 2 errors generated.
>
>
> vim +/optee_release_helper +1106 drivers/tee/optee/smc_abi.c
>
> 1101
> 1102 static void optee_smc_release_supp(struct tee_context *ctx)
> 1103 {
> 1104 struct optee *optee = tee_get_drvdata(ctx->teedev);
> 1105
> > 1106 optee_release_helper(ctx, optee_close_session_helper);
> 1107 if (optee->scan_bus_wq) {
> 1108 destroy_workqueue(optee->scan_bus_wq);
> 1109 optee->scan_bus_wq = NULL;
> 1110 }
> 1111 optee_supp_release(&optee->supp);
> 1112 kref_put(&optee->refcnt, optee_smc_delete);
> 1113 }
> 1114
>
> --
> 0-DAY CI Kernel Test Service
> https://01.org/lkp

\
 
 \ /
  Last update: 2023-03-26 23:24    [W:0.357 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site