linux-kernel - [PATCH v2] ksmbd: prevent memory leak on error return

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu,  9 Nov 2023 09:17:25 +0800
From:   Zongmin Zhou <min_halo@....com>
To:     linkinjeon@...nel.org
Cc:     linux-cifs@...r.kernel.org, linux-kernel@...r.kernel.org,
        senozhatsky@...omium.org, sfrench@...ba.org, tom@...pey.com,
        Zongmin Zhou <min_halo@....com>,
        kernel test robot <lkp@...el.com>,
        Dan Carpenter <error27@...il.com>,
        Zongmin Zhou <zhouzongmin@...inos.cn>
Subject: [PATCH v2] ksmbd: prevent memory leak on error return

When allocated memory for 'new' failed,just return
will cause memory leak of 'ar'.

v2: rollback iov_alloc_cnt when allocate memory failed.

Fixes: 1819a9042999 ("ksmbd: reorganize ksmbd_iov_pin_rsp()")

Reported-by: kernel test robot <lkp@...el.com>
Reported-by: Dan Carpenter <error27@...il.com>
Closes: https://lore.kernel.org/r/202311031837.H3yo7JVl-lkp@intel.com/
Signed-off-by: Zongmin Zhou<zhouzongmin@...inos.cn>
---
 fs/smb/server/ksmbd_work.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/smb/server/ksmbd_work.c b/fs/smb/server/ksmbd_work.c
index a2ed441e837a..44bce4c56daf 100644
--- a/fs/smb/server/ksmbd_work.c
+++ b/fs/smb/server/ksmbd_work.c
@@ -123,8 +123,11 @@ static int __ksmbd_iov_pin_rsp(struct ksmbd_work *work, void *ib, int len,
 		new = krealloc(work->iov,
 			       sizeof(struct kvec) * work->iov_alloc_cnt,
 			       GFP_KERNEL | __GFP_ZERO);
-		if (!new)
+		if (!new) {
+			kfree(ar);
+			work->iov_alloc_cnt -= 4;
 			return -ENOMEM;
+		}
 		work->iov = new;
 	}
 
-- 
2.34.1