Skip to content

Commit a89f5fa

Browse files
namjaejeonSteve French
authored andcommitted
ksmbd: add free_transport ops in ksmbd connection
free_transport function for tcp connection can be called from smbdirect. It will cause kernel oops. This patch add free_transport ops in ksmbd connection, and add each free_transports for tcp and smbdirect. Fixes: 21a4e47 ("ksmbd: fix use-after-free in __smb2_lease_break_noti()") Reviewed-by: Stefan Metzmacher <[email protected]> Signed-off-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent e04c78d commit a89f5fa

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

fs/smb/server/connection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void ksmbd_conn_free(struct ksmbd_conn *conn)
4040
kvfree(conn->request_buf);
4141
kfree(conn->preauth_info);
4242
if (atomic_dec_and_test(&conn->refcnt)) {
43-
ksmbd_free_transport(conn->transport);
43+
conn->transport->ops->free_transport(conn->transport);
4444
kfree(conn);
4545
}
4646
}

fs/smb/server/connection.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ struct ksmbd_transport_ops {
133133
void *buf, unsigned int len,
134134
struct smb2_buffer_desc_v1 *desc,
135135
unsigned int desc_len);
136+
void (*free_transport)(struct ksmbd_transport *kt);
136137
};
137138

138139
struct ksmbd_transport {

fs/smb/server/transport_rdma.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ struct smb_direct_transport {
159159
};
160160

161161
#define KSMBD_TRANS(t) ((struct ksmbd_transport *)&((t)->transport))
162-
162+
#define SMBD_TRANS(t) ((struct smb_direct_transport *)container_of(t, \
163+
struct smb_direct_transport, transport))
163164
enum {
164165
SMB_DIRECT_MSG_NEGOTIATE_REQ = 0,
165166
SMB_DIRECT_MSG_DATA_TRANSFER
@@ -410,6 +411,11 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)
410411
return NULL;
411412
}
412413

414+
static void smb_direct_free_transport(struct ksmbd_transport *kt)
415+
{
416+
kfree(SMBD_TRANS(kt));
417+
}
418+
413419
static void free_transport(struct smb_direct_transport *t)
414420
{
415421
struct smb_direct_recvmsg *recvmsg;
@@ -455,7 +461,6 @@ static void free_transport(struct smb_direct_transport *t)
455461

456462
smb_direct_destroy_pools(t);
457463
ksmbd_conn_free(KSMBD_TRANS(t)->conn);
458-
kfree(t);
459464
}
460465

461466
static struct smb_direct_sendmsg
@@ -2281,4 +2286,5 @@ static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = {
22812286
.read = smb_direct_read,
22822287
.rdma_read = smb_direct_rdma_read,
22832288
.rdma_write = smb_direct_rdma_write,
2289+
.free_transport = smb_direct_free_transport,
22842290
};

fs/smb/server/transport_tcp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static struct tcp_transport *alloc_transport(struct socket *client_sk)
9393
return t;
9494
}
9595

96-
void ksmbd_free_transport(struct ksmbd_transport *kt)
96+
static void ksmbd_tcp_free_transport(struct ksmbd_transport *kt)
9797
{
9898
struct tcp_transport *t = TCP_TRANS(kt);
9999

@@ -656,4 +656,5 @@ static const struct ksmbd_transport_ops ksmbd_tcp_transport_ops = {
656656
.read = ksmbd_tcp_read,
657657
.writev = ksmbd_tcp_writev,
658658
.disconnect = ksmbd_tcp_disconnect,
659+
.free_transport = ksmbd_tcp_free_transport,
659660
};

0 commit comments

Comments
 (0)