Skip to contentSkip to conversation

smb: server: smb2pdu: check return value of xa_store()

PATCH Superseded Salah Triki 2 participants 2 messages Apr 14, 2025 – Apr 15, 2025

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 fs/smb/server/smb2pdu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
fs/smb/server/smb2pdu.c +5 -2
index d24d95d15d87..e32f8910e892 100644
@@ -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))
+				return xa_err(old);
 		}
 	}
 
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 23 lines · Salah Triki

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

---
 fs/smb/server/smb2pdu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
fs/smb/server/smb2pdu.c +1 -1
index d24d95d15d87..e32f8910e892 100644
@@ -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;

fs/smb/server/smb2pdu.c static int ntlm_authenticate(struct ksmbd_work *work, · line 1562

Quoted 7 lines
fs/smb/server/smb2pdu.c +3 -1
@@ -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))

We need to free chann before returning the error.
Thanks.

Quoted 7 lines
fs/smb/server/smb2pdu.c +1 -1
+                               return xa_err(old);
                }
        }
 
--

2.43.0