From 880301bb313295a65523e79bc5666f5cf49eb3ed Mon Sep 17 00:00:00 2001

From: Colin Ian King <colin.king@canonical.com>

Date: Fri, 10 Sep 2021 11:02:02 +0100

Subject: [Backport 880301bb3132] src: Fix a memory leak on object opts

Currently a failed allocation on sbi->upcase will cause an exit via

the label free_sbi causing a memory leak on object opts. Fix this by

re-ordering the exit paths free_opts and free_sbi so that kfree's occur

in the reverse allocation order.

Addresses-Coverity: ("Resource leak")

Fixes: 27fac77707a1 ("src: Init spi more in init_fs_context than fill_super")

Signed-off-by: Colin Ian King <colin.king@canonical.com>

Reviewed-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/super.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/super.c b/src/super.c

index cefb9ddaf4db78890e9dc389416f47323bf33bcd..6a535b144ff961036704ba5a5ac5b1cab7ae9fb4 100644

--- a/src/super.c

+++ b/src/super.c

@@ -1393,10 +1393,10 @@ static int ntfs_init_fs_context(struct fs_context *fc)

 	fc->ops = &ntfs_context_ops;

 	return 0;

-free_opts:

-	kfree(opts);

 free_sbi:

 	kfree(sbi);

+free_opts:

+	kfree(opts);

 	return -ENOMEM;

 }

-- 

2.31.1