linux-kernel - [PATCH v2] smb: server: smb2pdu: check return value of xa

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>] [day] [month] [year] [list]

Message-ID: <Z_6aP_ZpEpxA5pfS@pc>
Date: Tue, 15 Apr 2025 18:41:19 +0100
From: Salah Triki <salah.triki@...il.com>
To: Namjae Jeon <linkinjeon@...nel.org>, Steve French <smfrench@...il.com>,
	Sergey Senozhatsky <senozhatsky@...omium.org>,
	Tom Talpey <tom@...pey.com>, linux-cifs@...r.kernel.org,
	linux-kernel@...r.kernel.org
Cc: salah.triki@...il.com
Subject: [PATCH v2] smb: server: smb2pdu: check return value of xa_store()

xa_store() may fail so check its return value and return error code if
error occurred.

Signed-off-by: Salah Triki <salah.triki@...il.com>
---
Change in v2:
   - Free chann before returning the error.

 fs/smb/server/smb2pdu.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index d24d95d15d87..2219dc8e6740 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -1445,7 +1445,7 @@ static int ntlm_authenticate(struct ksmbd_work *work,
 {
 	struct ksmbd_conn *conn = work->conn;
 	struct ksmbd_session *sess = work->sess;
-	struct channel *chann = NULL;
+	struct channel *chann = NULL, *old;
 	struct ksmbd_user *user;
 	u64 prev_id;
 	int sz, rc;
@@ -1557,7 +1557,10 @@ static int ntlm_authenticate(struct ksmbd_work *work,
 				return -ENOMEM;
 
 			chann->conn = conn;
-			xa_store(&sess->ksmbd_chann_list, (long)conn, chann, KSMBD_DEFAULT_GFP);
+			old = xa_store(&sess->ksmbd_chann_list, (long)conn, chann,
+					KSMBD_DEFAULT_GFP);
+			if (xa_is_err(old))
+				goto free_channel;
 		}
 	}
 
@@ -1574,6 +1577,10 @@ static int ntlm_authenticate(struct ksmbd_work *work,
 		return -ENOENT;
 	}
 	return 0;
+
+free_channel:
+	kfree(chann);
+	return xa_err(old);
 }
 
 #ifdef CONFIG_SMB_SERVER_KERBEROS5
-- 
2.43.0