All of lore.kernel.org
 help / color / mirror / Atom feed
From: Charlie Jenkins <charlie@rivosinc.com>
To: Paul Walmsley <paul.walmsley@sifive.com>,
	 Palmer Dabbelt <palmer@dabbelt.com>,
	Albert Ou <aou@eecs.berkeley.edu>
Cc: Palmer Dabbelt <palmer@rivosinc.com>,
	linux-riscv@lists.infradead.org,  linux-kernel@vger.kernel.org,
	Charlie Jenkins <charlie@rivosinc.com>,
	 kernel test robot <lkp@intel.com>,
	Dan Carpenter <error27@gmail.com>,
	 Julia Lawall <julia.lawall@inria.fr>
Subject: [PATCH v2 1/4] riscv: Fix module loading free order
Date: Wed, 03 Jan 2024 12:22:00 -0800	[thread overview]
Message-ID: <20240103-module_loading_fix-v2-1-292b160552c9@rivosinc.com> (raw)
In-Reply-To: <20240103-module_loading_fix-v2-0-292b160552c9@rivosinc.com>

Reverse order of kfree calls to resolve use-after-free error.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
Fixes: d8792a5734b0 ("riscv: Safely remove entries from relocation list")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/r/202312132019.iYGTwW0L-lkp@intel.com/
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Julia Lawall <julia.lawall@inria.fr>
Closes: https://lore.kernel.org/r/202312120044.wTI1Uyaa-lkp@intel.com/
---
 arch/riscv/kernel/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
index aac019ed63b1..21c7a773a8ef 100644
--- a/arch/riscv/kernel/module.c
+++ b/arch/riscv/kernel/module.c
@@ -723,8 +723,8 @@ static int add_relocation_to_accumulate(struct module *me, int type,
 
 			if (!bucket) {
 				kfree(entry);
-				kfree(rel_head);
 				kfree(rel_head->rel_entry);
+				kfree(rel_head);
 				return -ENOMEM;
 			}
 

-- 
2.43.0


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

WARNING: multiple messages have this Message-ID (diff)
From: Charlie Jenkins <charlie@rivosinc.com>
To: Paul Walmsley <paul.walmsley@sifive.com>,
	 Palmer Dabbelt <palmer@dabbelt.com>,
	Albert Ou <aou@eecs.berkeley.edu>
Cc: Palmer Dabbelt <palmer@rivosinc.com>,
	linux-riscv@lists.infradead.org,  linux-kernel@vger.kernel.org,
	Charlie Jenkins <charlie@rivosinc.com>,
	 kernel test robot <lkp@intel.com>,
	Dan Carpenter <error27@gmail.com>,
	 Julia Lawall <julia.lawall@inria.fr>
Subject: [PATCH v2 1/4] riscv: Fix module loading free order
Date: Wed, 03 Jan 2024 12:22:00 -0800	[thread overview]
Message-ID: <20240103-module_loading_fix-v2-1-292b160552c9@rivosinc.com> (raw)
In-Reply-To: <20240103-module_loading_fix-v2-0-292b160552c9@rivosinc.com>

Reverse order of kfree calls to resolve use-after-free error.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
Fixes: d8792a5734b0 ("riscv: Safely remove entries from relocation list")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/r/202312132019.iYGTwW0L-lkp@intel.com/
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Julia Lawall <julia.lawall@inria.fr>
Closes: https://lore.kernel.org/r/202312120044.wTI1Uyaa-lkp@intel.com/
---
 arch/riscv/kernel/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
index aac019ed63b1..21c7a773a8ef 100644
--- a/arch/riscv/kernel/module.c
+++ b/arch/riscv/kernel/module.c
@@ -723,8 +723,8 @@ static int add_relocation_to_accumulate(struct module *me, int type,
 
 			if (!bucket) {
 				kfree(entry);
-				kfree(rel_head);
 				kfree(rel_head->rel_entry);
+				kfree(rel_head);
 				return -ENOMEM;
 			}
 

-- 
2.43.0


  reply	other threads:[~2024-01-03 20:22 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-03 20:21 [PATCH v2 0/4] riscv: modules: Fix module loading error handling Charlie Jenkins
2024-01-03 20:21 ` Charlie Jenkins
2024-01-03 20:22 ` Charlie Jenkins [this message]
2024-01-03 20:22   ` [PATCH v2 1/4] riscv: Fix module loading free order Charlie Jenkins
2024-01-03 20:22 ` [PATCH v2 2/4] riscv: Correctly free relocation hashtable on error Charlie Jenkins
2024-01-03 20:22   ` Charlie Jenkins
2024-01-03 20:22 ` [PATCH v2 3/4] riscv: Fix relocation_hashtable size Charlie Jenkins
2024-01-03 20:22   ` Charlie Jenkins
2024-01-03 20:22 ` [PATCH v2 4/4] riscv: Convert relocation iterator to do-while Charlie Jenkins
2024-01-03 20:22   ` Charlie Jenkins
2024-01-04 12:35   ` Dan Carpenter
2024-01-04 12:35     ` Dan Carpenter
2024-01-04 19:36     ` Charlie Jenkins
2024-01-04 19:36       ` Charlie Jenkins

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240103-module_loading_fix-v2-1-292b160552c9@rivosinc.com \
    --to=charlie@rivosinc.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=error27@gmail.com \
    --cc=julia.lawall@inria.fr \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=lkp@intel.com \
    --cc=palmer@dabbelt.com \
    --cc=palmer@rivosinc.com \
    --cc=paul.walmsley@sifive.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.