History

Merge tag '6.15-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull smb client fixes from Steve French: - Fix hard link lease key problem when close is deferred - Revert the socket lockdep/refcount workarounds done in cifs.ko now that it is fixed at the socket layer * tag '6.15-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6: Revert "smb: client: fix TCP timers deadlock after rmmod" Revert "smb: client: Fix netns refcount imbalance causing leaks and use-after-free" smb3 client: fix open hardlink on deferred close file error

Linus Torvalds committed 1 year ago

Commit 85606972 parents 3088d26 95d2b9f3 files · +39 −25Browse files

Unified · Split

3 files
  1. fs/smb/client/cifsproto.h +2 −0
  2. fs/smb/client/connect.c +9 −25
  3. fs/smb/client/file.c +28 −0
fs/smb/client/cifsproto.h+2−0
@@ -163,6 +163,8 @@ extern int cifs_get_writable_path(struct cifs_tcon *tcon, const char *name, · 162 unmodified lines
163extern struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *, bool);163extern struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *, bool);
164extern int cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,164extern int cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,
165 struct cifsFileInfo **ret_file);165 struct cifsFileInfo **ret_file);
166extern int cifs_get_hardlink_path(struct cifs_tcon *tcon, struct inode *inode,
167 struct file *file);
166extern unsigned int smbCalcSize(void *buf);168extern unsigned int smbCalcSize(void *buf);
167extern int decode_negTokenInit(unsigned char *security_blob, int length,169extern int decode_negTokenInit(unsigned char *security_blob, int length,
168 struct TCP_Server_Info *server);170 struct TCP_Server_Info *server);
fs/smb/client/connect.c+9−25
@@ -300,7 +300,6 @@ cifs_abort_connection(struct TCP_Server_Info *server) · 299 unmodified lines
300 server->ssocket->flags);300 server->ssocket->flags);
301 sock_release(server->ssocket);301 sock_release(server->ssocket);
302 server->ssocket = NULL;302 server->ssocket = NULL;
303 put_net(cifs_net_ns(server));
304 }303 }
305 server->sequence_number = 0;304 server->sequence_number = 0;
306 server->session_estab = false;305 server->session_estab = false;
@@ -1074,13 +1073,9 @@ clean_demultiplex_info(struct TCP_Server_Info *server) · 767 unmodified lines
1074 msleep(125);1073 msleep(125);
1075 if (cifs_rdma_enabled(server))1074 if (cifs_rdma_enabled(server))
1076 smbd_destroy(server);1075 smbd_destroy(server);
1077
1078 if (server->ssocket) {1076 if (server->ssocket) {
1079 sock_release(server->ssocket);1077 sock_release(server->ssocket);
1080 server->ssocket = NULL;1078 server->ssocket = NULL;
1081
1082 /* Release netns reference for the socket. */
1083 put_net(cifs_net_ns(server));
1084 }1079 }
1085 1080
1086 if (!list_empty(&server->pending_mid_q)) {1081 if (!list_empty(&server->pending_mid_q)) {
@@ -1128,7 +1123,6 @@ clean_demultiplex_info(struct TCP_Server_Info *server) · 41 unmodified lines
1128 */1123 */
1129 }1124 }
1130 1125
1131 /* Release netns reference for this server. */
1132 put_net(cifs_net_ns(server));1126 put_net(cifs_net_ns(server));
1133 kfree(server->leaf_fullpath);1127 kfree(server->leaf_fullpath);
1134 kfree(server->hostname);1128 kfree(server->hostname);
@@ -1774,8 +1768,6 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx, · 639 unmodified lines
1774 1768
1775 tcp_ses->ops = ctx->ops;1769 tcp_ses->ops = ctx->ops;
1776 tcp_ses->vals = ctx->vals;1770 tcp_ses->vals = ctx->vals;
1777
1778 /* Grab netns reference for this server. */
1779 cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns));1771 cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns));
1780 1772
1781 tcp_ses->sign = ctx->sign;1773 tcp_ses->sign = ctx->sign;
@@ -1903,7 +1895,6 @@ smbd_connected: · 121 unmodified lines
1903out_err_crypto_release:1895out_err_crypto_release:
1904 cifs_crypto_secmech_release(tcp_ses);1896 cifs_crypto_secmech_release(tcp_ses);
1905 1897
1906 /* Release netns reference for this server. */
1907 put_net(cifs_net_ns(tcp_ses));1898 put_net(cifs_net_ns(tcp_ses));
1908 1899
1909out_err:1900out_err:
@@ -1912,10 +1903,8 @@ out_err: · 2 unmodified lines
1912 cifs_put_tcp_session(tcp_ses->primary_server, false);1903 cifs_put_tcp_session(tcp_ses->primary_server, false);
1913 kfree(tcp_ses->hostname);1904 kfree(tcp_ses->hostname);
1914 kfree(tcp_ses->leaf_fullpath);1905 kfree(tcp_ses->leaf_fullpath);
1915 if (tcp_ses->ssocket) {1906 if (tcp_ses->ssocket)
1916 sock_release(tcp_ses->ssocket);1907 sock_release(tcp_ses->ssocket);
1917 put_net(cifs_net_ns(tcp_ses));
1918 }
1919 kfree(tcp_ses);1908 kfree(tcp_ses);
1920 }1909 }
1921 return ERR_PTR(rc);1910 return ERR_PTR(rc);
@@ -3359,24 +3348,20 @@ generic_ip_connect(struct TCP_Server_Info *server) · 1437 unmodified lines
3359 socket = server->ssocket;3348 socket = server->ssocket;
3360 } else {3349 } else {
3361 struct net *net = cifs_net_ns(server);3350 struct net *net = cifs_net_ns(server);
3351 struct sock *sk;
3362 3352
3363 rc = sock_create_kern(net, sfamily, SOCK_STREAM, IPPROTO_TCP, &server->ssocket);3353 rc = __sock_create(net, sfamily, SOCK_STREAM,
3354 IPPROTO_TCP, &server->ssocket, 1);
3364 if (rc < 0) {3355 if (rc < 0) {
3365 cifs_server_dbg(VFS, "Error %d creating socket\n", rc);3356 cifs_server_dbg(VFS, "Error %d creating socket\n", rc);
3366 return rc;3357 return rc;
3367 }3358 }
3368 3359
3369 /*3360 sk = server->ssocket->sk;
3370 * Grab netns reference for the socket.3361 __netns_tracker_free(net, &sk->ns_tracker, false);
3371 *3362 sk->sk_net_refcnt = 1;
3372 * This reference will be released in several situations:3363 get_net_track(net, &sk->ns_tracker, GFP_KERNEL);
3373 * - In the failure path before the cifsd thread is started.3364 sock_inuse_add(net, 1);
3374 * - In the all place where server->socket is released, it is
3375 * also set to NULL.
3376 * - Ultimately in clean_demultiplex_info(), during the final
3377 * teardown.
3378 */
3379 get_net(net);
3380 3365
3381 /* BB other socket options to set KEEPALIVE, NODELAY? */3366 /* BB other socket options to set KEEPALIVE, NODELAY? */
3382 cifs_dbg(FYI, "Socket created\n");3367 cifs_dbg(FYI, "Socket created\n");
@@ -3428,7 +3413,6 @@ generic_ip_connect(struct TCP_Server_Info *server) · 45 unmodified lines
3428 if (rc < 0) {3413 if (rc < 0) {
3429 cifs_dbg(FYI, "Error %d connecting to server\n", rc);3414 cifs_dbg(FYI, "Error %d connecting to server\n", rc);
3430 trace_smb3_connect_err(server->hostname, server->conn_id, &server->dstaddr, rc);3415 trace_smb3_connect_err(server->hostname, server->conn_id, &server->dstaddr, rc);
3431 put_net(cifs_net_ns(server));
3432 sock_release(socket);3416 sock_release(socket);
3433 server->ssocket = NULL;3417 server->ssocket = NULL;
3434 return rc;3418 return rc;
fs/smb/client/file.c+28−0
@@ -1007,6 +1007,11 @@ int cifs_open(struct inode *inode, struct file *file) · 1006 unmodified lines
1007 } else {1007 } else {
1008 _cifsFileInfo_put(cfile, true, false);1008 _cifsFileInfo_put(cfile, true, false);
1009 }1009 }
1010 } else {
1011 /* hard link on the defeered close file */
1012 rc = cifs_get_hardlink_path(tcon, inode, file);
1013 if (rc)
1014 cifs_close_deferred_file(CIFS_I(inode));
1010 }1015 }
1011 1016
1012 if (server->oplocks)1017 if (server->oplocks)
@@ -2071,6 +2076,29 @@ cifs_move_llist(struct list_head *source, struct list_head *dest) · 1058 unmodified lines
2071 list_move(li, dest);2076 list_move(li, dest);
2072}2077}
2073 2078
2079int
2080cifs_get_hardlink_path(struct cifs_tcon *tcon, struct inode *inode,
2081 struct file *file)
2082{
2083 struct cifsFileInfo *open_file = NULL;
2084 struct cifsInodeInfo *cinode = CIFS_I(inode);
2085 int rc = 0;
2086
2087 spin_lock(&tcon->open_file_lock);
2088 spin_lock(&cinode->open_file_lock);
2089
2090 list_for_each_entry(open_file, &cinode->openFileList, flist) {
2091 if (file->f_flags == open_file->f_flags) {
2092 rc = -EINVAL;
2093 break;
2094 }
2095 }
2096
2097 spin_unlock(&cinode->open_file_lock);
2098 spin_unlock(&tcon->open_file_lock);
2099 return rc;
2100}
2101
2074void2102void
2075cifs_free_llist(struct list_head *llist)2103cifs_free_llist(struct list_head *llist)
2076{2104{

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t