History

Merge tag '5.19-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs client fixes from Steve French: "Nine cifs/smb3 client fixes. Includes DFS fixes, some cleanup of leagcy SMB1 code, duplicated message cleanup and a double free and deadlock fix" * tag '5.19-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6: cifs: fix uninitialized pointer in error case in dfs_cache_get_tgt_share cifs: skip trailing separators of prefix paths cifs: update internal module number cifs: version operations for smb20 unneeded when legacy support disabled cifs: do not build smb1ops if legacy support is disabled cifs: fix potential deadlock in direct reclaim cifs: when extending a file with falloc we should make files not-sparse cifs: remove repeated debug message on cifs_put_smb_ses() cifs: fix potential double free during failed mount

Linus Torvalds committed 4 years ago

Commit d66016c2 parents d0e60d4 ee3c80114 files · +143 −100Browse files

Unified · Split

14 files
  1. fs/cifs/Makefile +3 −1
  2. fs/cifs/cifs_swn.c +2 −2
  3. fs/cifs/cifsencrypt.c +4 −4
  4. fs/cifs/cifsfs.c +6 −4
  5. fs/cifs/cifsfs.h +3 −2
  6. fs/cifs/cifsglob.h +22 −2
  7. fs/cifs/connect.c +13 −14
  8. fs/cifs/dfs_cache.c +52 −38
  9. fs/cifs/sess.c +3 −3
  10. fs/cifs/smb1ops.c +3 −3
  11. fs/cifs/smb2ops.c +7 −2
  12. fs/cifs/smb2pdu.c +3 −3
  13. fs/cifs/smbdirect.c +2 −2
  14. fs/cifs/transport.c +20 −20
fs/cifs/Makefile+3−1
@@ -8,7 +8,7 @@ obj-$(CONFIG_CIFS) += cifs.o · 7 unmodified lines
88 cifs-y := trace.o cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o \
99 inode.o link.o misc.o netmisc.o smbencrypt.o transport.o \
1010 cifs_unicode.o nterr.o cifsencrypt.o \
11− readdir.o ioctl.o sess.o export.o smb1ops.o unc.o winucase.o \
11+ readdir.o ioctl.o sess.o export.o unc.o winucase.o \
1212 smb2ops.o smb2maperror.o smb2transport.o \
1313 smb2misc.o smb2pdu.o smb2inode.o smb2file.o cifsacl.o fs_context.o \
1414 dns_resolve.o cifs_spnego_negtokeninit.asn1.o asn1.o
@@ -30,3 +30,5 @@ cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o · 15 unmodified lines
3030 cifs-$(CONFIG_CIFS_SMB_DIRECT) += smbdirect.o
3131
3232 cifs-$(CONFIG_CIFS_ROOT) += cifsroot.o
33+
34+cifs-$(CONFIG_CIFS_ALLOW_INSECURE_LEGACY) += smb1ops.o
fs/cifs/cifs_swn.c+2−2
@@ -465,7 +465,7 @@ static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *a · 464 unmodified lines
465465 int ret = 0;
466466
467467 /* Store the reconnect address */
468− mutex_lock(&tcon->ses->server->srv_mutex);
468+ cifs_server_lock(tcon->ses->server);
469469 if (cifs_sockaddr_equal(&tcon->ses->server->dstaddr, addr))
470470 goto unlock;
471471
@@ -501,7 +501,7 @@ static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *a · 29 unmodified lines
501501 cifs_signal_cifsd_for_reconnect(tcon->ses->server, false);
502502
503503 unlock:
504− mutex_unlock(&tcon->ses->server->srv_mutex);
504+ cifs_server_unlock(tcon->ses->server);
505505
506506 return ret;
507507 }
fs/cifs/cifsencrypt.c+4−4
@@ -236,9 +236,9 @@ int cifs_verify_signature(struct smb_rqst *rqst, · 235 unmodified lines
236236 cpu_to_le32(expected_sequence_number);
237237 cifs_pdu->Signature.Sequence.Reserved = 0;
238238
239− mutex_lock(&server->srv_mutex);
239+ cifs_server_lock(server);
240240 rc = cifs_calc_signature(rqst, server, what_we_think_sig_should_be);
241− mutex_unlock(&server->srv_mutex);
241+ cifs_server_unlock(server);
242242
243243 if (rc)
244244 return rc;
@@ -626,7 +626,7 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) · 381 unmodified lines
626626
627627 memcpy(ses->auth_key.response + baselen, tiblob, tilen);
628628
629− mutex_lock(&ses->server->srv_mutex);
629+ cifs_server_lock(ses->server);
630630
631631 rc = cifs_alloc_hash("hmac(md5)",
632632 &ses->server->secmech.hmacmd5,
@@ -678,7 +678,7 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) · 45 unmodified lines
678678 cifs_dbg(VFS, "%s: Could not generate md5 hash\n", __func__);
679679
680680 unlock:
681− mutex_unlock(&ses->server->srv_mutex);
681+ cifs_server_unlock(ses->server);
682682 setup_ntlmv2_rsp_ret:
683683 kfree(tiblob);
684684
fs/cifs/cifsfs.c+6−4
@@ -838,7 +838,7 @@ cifs_smb3_do_mount(struct file_system_type *fs_type, · 837 unmodified lines
838838 int flags, struct smb3_fs_context *old_ctx)
839839 {
840840 int rc;
841− struct super_block *sb;
841+ struct super_block *sb = NULL;
842842 struct cifs_sb_info *cifs_sb = NULL;
843843 struct cifs_mnt_data mnt_data;
844844 struct dentry *root;
@@ -934,9 +934,11 @@ out_super: · 89 unmodified lines
934934 return root;
935935 out:
936936 if (cifs_sb) {
937− kfree(cifs_sb->prepath);
938− smb3_cleanup_fs_context(cifs_sb->ctx);
939− kfree(cifs_sb);
937+ if (!sb || IS_ERR(sb)) { /* otherwise kill_sb will handle */
938+ kfree(cifs_sb->prepath);
939+ smb3_cleanup_fs_context(cifs_sb->ctx);
940+ kfree(cifs_sb);
941+ }
940942 }
941943 return root;
942944 }
fs/cifs/cifsfs.h+3−2
@@ -152,6 +152,7 @@ extern struct dentry *cifs_smb3_do_mount(struct file_system_type *fs_type, · 151 unmodified lines
152152 extern const struct export_operations cifs_export_ops;
153153 #endif /* CONFIG_CIFS_NFSD_EXPORT */
154154
155−#define SMB3_PRODUCT_BUILD 35
156−#define CIFS_VERSION "2.36"
155+/* when changing internal version - update following two lines at same time */
156+#define SMB3_PRODUCT_BUILD 37
157+#define CIFS_VERSION "2.37"
157158 #endif /* _CIFSFS_H */
fs/cifs/cifsglob.h+22−2
@@ -16,6 +16,7 @@ · 15 unmodified lines
1616 #include <linux/mempool.h>
1717 #include <linux/workqueue.h>
1818 #include <linux/utsname.h>
19+#include <linux/sched/mm.h>
1920 #include <linux/netfs.h>
2021 #include "cifs_fs_sb.h"
2122 #include "cifsacl.h"
@@ -628,7 +629,8 @@ struct TCP_Server_Info { · 606 unmodified lines
628629 unsigned int in_flight; /* number of requests on the wire to server */
629630 unsigned int max_in_flight; /* max number of requests that were on wire */
630631 spinlock_t req_lock; /* protect the two values above */
631− struct mutex srv_mutex;
632+ struct mutex _srv_mutex;
633+ unsigned int nofs_flag;
632634 struct task_struct *tsk;
633635 char server_GUID[16];
634636 __u16 sec_mode;
@@ -743,6 +745,22 @@ struct TCP_Server_Info { · 108 unmodified lines
743745 #endif
744746 };
745747
748+static inline void cifs_server_lock(struct TCP_Server_Info *server)
749+{
750+ unsigned int nofs_flag = memalloc_nofs_save();
751+
752+ mutex_lock(&server->_srv_mutex);
753+ server->nofs_flag = nofs_flag;
754+}
755+
756+static inline void cifs_server_unlock(struct TCP_Server_Info *server)
757+{
758+ unsigned int nofs_flag = server->nofs_flag;
759+
760+ mutex_unlock(&server->_srv_mutex);
761+ memalloc_nofs_restore(nofs_flag);
762+}
763+
746764 struct cifs_credits {
747765 unsigned int value;
748766 unsigned int instance;
@@ -1945,11 +1963,13 @@ extern mempool_t *cifs_mid_poolp; · 1196 unmodified lines
19451963
19461964 /* Operations for different SMB versions */
19471965 #define SMB1_VERSION_STRING "1.0"
1966+#define SMB20_VERSION_STRING "2.0"
1967+#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
19481968 extern struct smb_version_operations smb1_operations;
19491969 extern struct smb_version_values smb1_values;
1950−#define SMB20_VERSION_STRING "2.0"
19511970 extern struct smb_version_operations smb20_operations;
19521971 extern struct smb_version_values smb20_values;
1972+#endif /* CIFS_ALLOW_INSECURE_LEGACY */
19531973 #define SMB21_VERSION_STRING "2.1"
19541974 extern struct smb_version_operations smb21_operations;
19551975 extern struct smb_version_values smb21_values;
fs/cifs/connect.c+13−14
@@ -148,7 +148,7 @@ static void cifs_resolve_server(struct work_struct *work) · 147 unmodified lines
148148 struct TCP_Server_Info *server = container_of(work,
149149 struct TCP_Server_Info, resolve.work);
150150
151− mutex_lock(&server->srv_mutex);
151+ cifs_server_lock(server);
152152
153153 /*
154154 * Resolve the hostname again to make sure that IP address is up-to-date.
@@ -159,7 +159,7 @@ static void cifs_resolve_server(struct work_struct *work) · 4 unmodified lines
159159 __func__, rc);
160160 }
161161
162− mutex_unlock(&server->srv_mutex);
162+ cifs_server_unlock(server);
163163 }
164164
165165 /*
@@ -267,7 +267,7 @@ cifs_abort_connection(struct TCP_Server_Info *server) · 101 unmodified lines
267267
268268 /* do not want to be sending data on a socket we are freeing */
269269 cifs_dbg(FYI, "%s: tearing down socket\n", __func__);
270− mutex_lock(&server->srv_mutex);
270+ cifs_server_lock(server);
271271 if (server->ssocket) {
272272 cifs_dbg(FYI, "State: 0x%x Flags: 0x%lx\n", server->ssocket->state,
273273 server->ssocket->flags);
@@ -296,7 +296,7 @@ cifs_abort_connection(struct TCP_Server_Info *server) · 22 unmodified lines
296296 mid->mid_flags |= MID_DELETED;
297297 }
298298 spin_unlock(&GlobalMid_Lock);
299− mutex_unlock(&server->srv_mutex);
299+ cifs_server_unlock(server);
300300
301301 cifs_dbg(FYI, "%s: issuing mid callbacks\n", __func__);
302302 list_for_each_entry_safe(mid, nmid, &retry_list, qhead) {
@@ -306,9 +306,9 @@ cifs_abort_connection(struct TCP_Server_Info *server) · 3 unmodified lines
306306 }
307307
308308 if (cifs_rdma_enabled(server)) {
309− mutex_lock(&server->srv_mutex);
309+ cifs_server_lock(server);
310310 smbd_destroy(server);
311− mutex_unlock(&server->srv_mutex);
311+ cifs_server_unlock(server);
312312 }
313313 }
314314
@@ -359,7 +359,7 @@ static int __cifs_reconnect(struct TCP_Server_Info *server, · 44 unmodified lines
359359
360360 do {
361361 try_to_freeze();
362− mutex_lock(&server->srv_mutex);
362+ cifs_server_lock(server);
363363
364364 if (!cifs_swn_set_server_dstaddr(server)) {
365365 /* resolve the hostname again to make sure that IP address is up-to-date */
@@ -372,7 +372,7 @@ static int __cifs_reconnect(struct TCP_Server_Info *server, · 6 unmodified lines
372372 else
373373 rc = generic_ip_connect(server);
374374 if (rc) {
375− mutex_unlock(&server->srv_mutex);
375+ cifs_server_unlock(server);
376376 cifs_dbg(FYI, "%s: reconnect error %d\n", __func__, rc);
377377 msleep(3000);
378378 } else {
@@ -383,7 +383,7 @@ static int __cifs_reconnect(struct TCP_Server_Info *server, · 4 unmodified lines
383383 server->tcpStatus = CifsNeedNegotiate;
384384 spin_unlock(&cifs_tcp_ses_lock);
385385 cifs_swn_reset_server_dstaddr(server);
386− mutex_unlock(&server->srv_mutex);
386+ cifs_server_unlock(server);
387387 mod_delayed_work(cifsiod_wq, &server->reconnect, 0);
388388 }
389389 } while (server->tcpStatus == CifsNeedReconnect);
@@ -488,12 +488,12 @@ static int reconnect_dfs_server(struct TCP_Server_Info *server) · 98 unmodified lines
488488
489489 do {
490490 try_to_freeze();
491− mutex_lock(&server->srv_mutex);
491+ cifs_server_lock(server);
492492
493493 rc = reconnect_target_unlocked(server, &tl, &target_hint);
494494 if (rc) {
495495 /* Failed to reconnect socket */
496− mutex_unlock(&server->srv_mutex);
496+ cifs_server_unlock(server);
497497 cifs_dbg(FYI, "%s: reconnect error %d\n", __func__, rc);
498498 msleep(3000);
499499 continue;
@@ -510,7 +510,7 @@ static int reconnect_dfs_server(struct TCP_Server_Info *server) · 10 unmodified lines
510510 server->tcpStatus = CifsNeedNegotiate;
511511 spin_unlock(&cifs_tcp_ses_lock);
512512 cifs_swn_reset_server_dstaddr(server);
513− mutex_unlock(&server->srv_mutex);
513+ cifs_server_unlock(server);
514514 mod_delayed_work(cifsiod_wq, &server->reconnect, 0);
515515 } while (server->tcpStatus == CifsNeedReconnect);
516516
@@ -1565,7 +1565,7 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx, · 1048 unmodified lines
15651565 init_waitqueue_head(&tcp_ses->response_q);
15661566 init_waitqueue_head(&tcp_ses->request_q);
15671567 INIT_LIST_HEAD(&tcp_ses->pending_mid_q);
1568− mutex_init(&tcp_ses->srv_mutex);
1568+ mutex_init(&tcp_ses->_srv_mutex);
15691569 memcpy(tcp_ses->workstation_RFC1001_name,
15701570 ctx->source_rfc1001_name, RFC1001_NAME_LEN_WITH_NULL);
15711571 memcpy(tcp_ses->server_RFC1001_name,
@@ -1845,7 +1845,6 @@ void cifs_put_smb_ses(struct cifs_ses *ses) · 273 unmodified lines
18451845 unsigned int rc, xid;
18461846 unsigned int chan_count;
18471847 struct TCP_Server_Info *server = ses->server;
1848− cifs_dbg(FYI, "%s: ses_count=%d\n", __func__, ses->ses_count);
18491848
18501849 spin_lock(&cifs_tcp_ses_lock);
18511850 if (ses->ses_status == SES_EXITING) {
fs/cifs/dfs_cache.c+52−38
@@ -1229,6 +1229,30 @@ void dfs_cache_put_refsrv_sessions(const uuid_t *mount_id) · 1228 unmodified lines
12291229 kref_put(&mg->refcount, mount_group_release);
12301230 }
12311231
1232+/* Extract share from DFS target and return a pointer to prefix path or NULL */
1233+static const char *parse_target_share(const char *target, char **share)
1234+{
1235+ const char *s, *seps = "/\\";
1236+ size_t len;
1237+
1238+ s = strpbrk(target + 1, seps);
1239+ if (!s)
1240+ return ERR_PTR(-EINVAL);
1241+
1242+ len = strcspn(s + 1, seps);
1243+ if (!len)
1244+ return ERR_PTR(-EINVAL);
1245+ s += len;
1246+
1247+ len = s - target + 1;
1248+ *share = kstrndup(target, len, GFP_KERNEL);
1249+ if (!*share)
1250+ return ERR_PTR(-ENOMEM);
1251+
1252+ s = target + len;
1253+ return s + strspn(s, seps);
1254+}
1255+
12321256 /**
12331257 * dfs_cache_get_tgt_share - parse a DFS target
12341258 *
@@ -1242,56 +1266,46 @@ void dfs_cache_put_refsrv_sessions(const uuid_t *mount_id) · 7 unmodified lines
12421266 int dfs_cache_get_tgt_share(char *path, const struct dfs_cache_tgt_iterator *it, char **share,
12431267 char **prefix)
12441268 {
1245− char *s, sep, *p;
1246− size_t len;
1247− size_t plen1, plen2;
1269+ char sep;
1270+ char *target_share;
1271+ char *ppath = NULL;
1272+ const char *target_ppath, *dfsref_ppath;
1273+ size_t target_pplen, dfsref_pplen;
1274+ size_t len, c;
12481275
12491276 if (!it || !path || !share || !prefix || strlen(path) < it->it_path_consumed)
12501277 return -EINVAL;
12511278
1252− *share = NULL;
1253− *prefix = NULL;
1254−
12551279 sep = it->it_name[0];
12561280 if (sep != '\\' && sep != '/')
12571281 return -EINVAL;
12581282
1259− s = strchr(it->it_name + 1, sep);
1260− if (!s)
1261− return -EINVAL;
1283+ target_ppath = parse_target_share(it->it_name, &target_share);
1284+ if (IS_ERR(target_ppath))
1285+ return PTR_ERR(target_ppath);
12621286
1263− /* point to prefix in target node */
1264− s = strchrnul(s + 1, sep);
1287+ /* point to prefix in DFS referral path */
1288+ dfsref_ppath = path + it->it_path_consumed;
1289+ dfsref_ppath += strspn(dfsref_ppath, "/\\");
12651290
1266− /* extract target share */
1267− *share = kstrndup(it->it_name, s - it->it_name, GFP_KERNEL);
1268− if (!*share)
1269− return -ENOMEM;
1291+ target_pplen = strlen(target_ppath);
1292+ dfsref_pplen = strlen(dfsref_ppath);
12701293
1271− /* skip separator */
1272− if (*s)
1273− s++;
1274− /* point to prefix in DFS path */
1275− p = path + it->it_path_consumed;
1276− if (*p == sep)
1277− p++;
1278−
1279− /* merge prefix paths from DFS path and target node */
1280− plen1 = it->it_name + strlen(it->it_name) - s;
1281− plen2 = path + strlen(path) - p;
1282− if (plen1 || plen2) {
1283− len = plen1 + plen2 + 2;
1284− *prefix = kmalloc(len, GFP_KERNEL);
1285− if (!*prefix) {
1286− kfree(*share);
1287− *share = NULL;
1294+ /* merge prefix paths from DFS referral path and target node */
1295+ if (target_pplen || dfsref_pplen) {
1296+ len = target_pplen + dfsref_pplen + 2;
1297+ ppath = kzalloc(len, GFP_KERNEL);
1298+ if (!ppath) {
1299+ kfree(target_share);
12881300 return -ENOMEM;
12891301 }
1290− if (plen1)
1291− scnprintf(*prefix, len, "%.*s%c%.*s", (int)plen1, s, sep, (int)plen2, p);
1292− else
1293− strscpy(*prefix, p, len);
1302+ c = strscpy(ppath, target_ppath, len);
1303+ if (c && dfsref_pplen)
1304+ ppath[c] = sep;
1305+ strlcat(ppath, dfsref_ppath, len);
12941306 }
1307+ *share = target_share;
1308+ *prefix = ppath;
12951309 return 0;
12961310 }
12971311
@@ -1327,9 +1341,9 @@ static bool target_share_equal(struct TCP_Server_Info *server, const char *s1, c · 29 unmodified lines
13271341 cifs_dbg(VFS, "%s: failed to convert address \'%s\'. skip address matching.\n",
13281342 __func__, ip);
13291343 } else {
1330− mutex_lock(&server->srv_mutex);
1344+ cifs_server_lock(server);
13311345 match = cifs_match_ipaddr((struct sockaddr *)&server->dstaddr, &sa);
1332− mutex_unlock(&server->srv_mutex);
1346+ cifs_server_unlock(server);
13331347 }
13341348
13351349 kfree(ip);
fs/cifs/sess.c+3−3
@@ -1120,14 +1120,14 @@ sess_establish_session(struct sess_data *sess_data) · 1119 unmodified lines
11201120 struct cifs_ses *ses = sess_data->ses;
11211121 struct TCP_Server_Info *server = sess_data->server;
11221122
1123− mutex_lock(&server->srv_mutex);
1123+ cifs_server_lock(server);
11241124 if (!server->session_estab) {
11251125 if (server->sign) {
11261126 server->session_key.response =
11271127 kmemdup(ses->auth_key.response,
11281128 ses->auth_key.len, GFP_KERNEL);
11291129 if (!server->session_key.response) {
1130− mutex_unlock(&server->srv_mutex);
1130+ cifs_server_unlock(server);
11311131 return -ENOMEM;
11321132 }
11331133 server->session_key.len =
@@ -1136,7 +1136,7 @@ sess_establish_session(struct sess_data *sess_data) · 2 unmodified lines
11361136 server->sequence_number = 0x2;
11371137 server->session_estab = true;
11381138 }
1139− mutex_unlock(&server->srv_mutex);
1139+ cifs_server_unlock(server);
11401140
11411141 cifs_dbg(FYI, "CIFS session established successfully\n");
11421142 return 0;
fs/cifs/smb1ops.c+3−3
@@ -38,10 +38,10 @@ send_nt_cancel(struct TCP_Server_Info *server, struct smb_rqst *rqst, · 37 unmodified lines
3838 in_buf->WordCount = 0;
3939 put_bcc(0, in_buf);
4040
41− mutex_lock(&server->srv_mutex);
41+ cifs_server_lock(server);
4242 rc = cifs_sign_smb(in_buf, server, &mid->sequence_number);
4343 if (rc) {
44− mutex_unlock(&server->srv_mutex);
44+ cifs_server_unlock(server);
4545 return rc;
4646 }
4747
@@ -55,7 +55,7 @@ send_nt_cancel(struct TCP_Server_Info *server, struct smb_rqst *rqst, · 7 unmodified lines
5555 if (rc < 0)
5656 server->sequence_number--;
5757
58− mutex_unlock(&server->srv_mutex);
58+ cifs_server_unlock(server);
5959
6060 cifs_dbg(FYI, "issued NT_CANCEL for mid %u, rc = %d\n",
6161 get_mid(in_buf), rc);
fs/cifs/smb2ops.c+7−2
@@ -3859,7 +3859,7 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon, · 3858 unmodified lines
38593859 if (rc)
38603860 goto out;
38613861
3862− if ((cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE) == 0)
3862+ if (cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE)
38633863 smb2_set_sparse(xid, tcon, cfile, inode, false);
38643864
38653865 eof = cpu_to_le64(off + len);
@@ -4345,11 +4345,13 @@ smb3_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock, · 479 unmodified lines
43454345 }
43464346 }
43474347
4348+#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
43484349 static bool
43494350 smb2_is_read_op(__u32 oplock)
43504351 {
43514352 return oplock == SMB2_OPLOCK_LEVEL_II;
43524353 }
4354+#endif /* CIFS_ALLOW_INSECURE_LEGACY */
43534355
43544356 static bool
43554357 smb21_is_read_op(__u32 oplock)
@@ -5448,7 +5450,7 @@ out: · 1092 unmodified lines
54485450 return rc;
54495451 }
54505452
5451−
5453+#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
54525454 struct smb_version_operations smb20_operations = {
54535455 .compare_fids = smb2_compare_fids,
54545456 .setup_request = smb2_setup_request,
@@ -5547,6 +5549,7 @@ struct smb_version_operations smb20_operations = { · 92 unmodified lines
55475549 .is_status_io_timeout = smb2_is_status_io_timeout,
55485550 .is_network_name_deleted = smb2_is_network_name_deleted,
55495551 };
5552+#endif /* CIFS_ALLOW_INSECURE_LEGACY */
55505553
55515554 struct smb_version_operations smb21_operations = {
55525555 .compare_fids = smb2_compare_fids,
@@ -5878,6 +5881,7 @@ struct smb_version_operations smb311_operations = { · 325 unmodified lines
58785881 .is_network_name_deleted = smb2_is_network_name_deleted,
58795882 };
58805883
5884+#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
58815885 struct smb_version_values smb20_values = {
58825886 .version_string = SMB20_VERSION_STRING,
58835887 .protocol_id = SMB20_PROT_ID,
@@ -5898,6 +5902,7 @@ struct smb_version_values smb20_values = { · 14 unmodified lines
58985902 .signing_required = SMB2_NEGOTIATE_SIGNING_REQUIRED,
58995903 .create_lease_size = sizeof(struct create_lease),
59005904 };
5905+#endif /* ALLOW_INSECURE_LEGACY */
59015906
59025907 struct smb_version_values smb21_values = {
59035908 .version_string = SMB21_VERSION_STRING,
fs/cifs/smb2pdu.c+3−3
@@ -1369,13 +1369,13 @@ SMB2_sess_establish_session(struct SMB2_sess_data *sess_data) · 1368 unmodified lines
13691369 struct cifs_ses *ses = sess_data->ses;
13701370 struct TCP_Server_Info *server = sess_data->server;
13711371
1372− mutex_lock(&server->srv_mutex);
1372+ cifs_server_lock(server);
13731373 if (server->ops->generate_signingkey) {
13741374 rc = server->ops->generate_signingkey(ses, server);
13751375 if (rc) {
13761376 cifs_dbg(FYI,
13771377 "SMB3 session key generation failed\n");
1378− mutex_unlock(&server->srv_mutex);
1378+ cifs_server_unlock(server);
13791379 return rc;
13801380 }
13811381 }
@@ -1383,7 +1383,7 @@ SMB2_sess_establish_session(struct SMB2_sess_data *sess_data) · 1 unmodified line
13831383 server->sequence_number = 0x2;
13841384 server->session_estab = true;
13851385 }
1386− mutex_unlock(&server->srv_mutex);
1386+ cifs_server_unlock(server);
13871387
13881388 cifs_dbg(FYI, "SMB2/3 session established successfully\n");
13891389 return rc;
fs/cifs/smbdirect.c+2−2
@@ -1382,9 +1382,9 @@ void smbd_destroy(struct TCP_Server_Info *server) · 1381 unmodified lines
13821382 log_rdma_event(INFO, "freeing mr list\n");
13831383 wake_up_interruptible_all(&info->wait_mr);
13841384 while (atomic_read(&info->mr_used_count)) {
1385− mutex_unlock(&server->srv_mutex);
1385+ cifs_server_unlock(server);
13861386 msleep(1000);
1387− mutex_lock(&server->srv_mutex);
1387+ cifs_server_lock(server);
13881388 }
13891389 destroy_mr_list(info);
13901390
fs/cifs/transport.c+20−20
@@ -822,7 +822,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst, · 821 unmodified lines
822822 } else
823823 instance = exist_credits->instance;
824824
825− mutex_lock(&server->srv_mutex);
825+ cifs_server_lock(server);
826826
827827 /*
828828 * We can't use credits obtained from the previous session to send this
@@ -830,14 +830,14 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst, · 1 unmodified line
830830 * return -EAGAIN in such cases to let callers handle it.
831831 */
832832 if (instance != server->reconnect_instance) {
833− mutex_unlock(&server->srv_mutex);
833+ cifs_server_unlock(server);
834834 add_credits_and_wake_if(server, &credits, optype);
835835 return -EAGAIN;
836836 }
837837
838838 mid = server->ops->setup_async_request(server, rqst);
839839 if (IS_ERR(mid)) {
840− mutex_unlock(&server->srv_mutex);
840+ cifs_server_unlock(server);
841841 add_credits_and_wake_if(server, &credits, optype);
842842 return PTR_ERR(mid);
843843 }
@@ -868,7 +868,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst, · 24 unmodified lines
868868 cifs_delete_mid(mid);
869869 }
870870
871− mutex_unlock(&server->srv_mutex);
871+ cifs_server_unlock(server);
872872
873873 if (rc == 0)
874874 return 0;
@@ -1109,7 +1109,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, · 234 unmodified lines
11091109 * of smb data.
11101110 */
11111111
1112− mutex_lock(&server->srv_mutex);
1112+ cifs_server_lock(server);
11131113
11141114 /*
11151115 * All the parts of the compound chain belong obtained credits from the
@@ -1119,7 +1119,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, · 3 unmodified lines
11191119 * handle it.
11201120 */
11211121 if (instance != server->reconnect_instance) {
1122− mutex_unlock(&server->srv_mutex);
1122+ cifs_server_unlock(server);
11231123 for (j = 0; j < num_rqst; j++)
11241124 add_credits(server, &credits[j], optype);
11251125 return -EAGAIN;
@@ -1131,7 +1131,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, · 5 unmodified lines
11311131 revert_current_mid(server, i);
11321132 for (j = 0; j < i; j++)
11331133 cifs_delete_mid(midQ[j]);
1134− mutex_unlock(&server->srv_mutex);
1134+ cifs_server_unlock(server);
11351135
11361136 /* Update # of requests on wire to server */
11371137 for (j = 0; j < num_rqst; j++)
@@ -1163,7 +1163,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, · 25 unmodified lines
11631163 server->sequence_number -= 2;
11641164 }
11651165
1166− mutex_unlock(&server->srv_mutex);
1166+ cifs_server_unlock(server);
11671167
11681168 /*
11691169 * If sending failed for some reason or it is an oplock break that we
@@ -1190,9 +1190,9 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, · 20 unmodified lines
11901190 if ((ses->ses_status == SES_NEW) || (optype & CIFS_NEG_OP) || (optype & CIFS_SESS_OP)) {
11911191 spin_unlock(&cifs_tcp_ses_lock);
11921192
1193− mutex_lock(&server->srv_mutex);
1193+ cifs_server_lock(server);
11941194 smb311_update_preauth_hash(ses, server, rqst[0].rq_iov, rqst[0].rq_nvec);
1195− mutex_unlock(&server->srv_mutex);
1195+ cifs_server_unlock(server);
11961196
11971197 spin_lock(&cifs_tcp_ses_lock);
11981198 }
@@ -1266,9 +1266,9 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, · 67 unmodified lines
12661266 .iov_len = resp_iov[0].iov_len
12671267 };
12681268 spin_unlock(&cifs_tcp_ses_lock);
1269− mutex_lock(&server->srv_mutex);
1269+ cifs_server_lock(server);
12701270 smb311_update_preauth_hash(ses, server, &iov, 1);
1271− mutex_unlock(&server->srv_mutex);
1271+ cifs_server_unlock(server);
12721272 spin_lock(&cifs_tcp_ses_lock);
12731273 }
12741274 spin_unlock(&cifs_tcp_ses_lock);
@@ -1385,11 +1385,11 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, · 110 unmodified lines
13851385 and avoid races inside tcp sendmsg code that could cause corruption
13861386 of smb data */
13871387
1388− mutex_lock(&server->srv_mutex);
1388+ cifs_server_lock(server);
13891389
13901390 rc = allocate_mid(ses, in_buf, &midQ);
13911391 if (rc) {
1392− mutex_unlock(&server->srv_mutex);
1392+ cifs_server_unlock(server);
13931393 /* Update # of requests on wire to server */
13941394 add_credits(server, &credits, 0);
13951395 return rc;
@@ -1397,7 +1397,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, · 1 unmodified line
13971397
13981398 rc = cifs_sign_smb(in_buf, server, &midQ->sequence_number);
13991399 if (rc) {
1400− mutex_unlock(&server->srv_mutex);
1400+ cifs_server_unlock(server);
14011401 goto out;
14021402 }
14031403
@@ -1411,7 +1411,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, · 7 unmodified lines
14111411 if (rc < 0)
14121412 server->sequence_number -= 2;
14131413
1414− mutex_unlock(&server->srv_mutex);
1414+ cifs_server_unlock(server);
14151415
14161416 if (rc < 0)
14171417 goto out;
@@ -1530,18 +1530,18 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, · 112 unmodified lines
15301530 and avoid races inside tcp sendmsg code that could cause corruption
15311531 of smb data */
15321532
1533− mutex_lock(&server->srv_mutex);
1533+ cifs_server_lock(server);
15341534
15351535 rc = allocate_mid(ses, in_buf, &midQ);
15361536 if (rc) {
1537− mutex_unlock(&server->srv_mutex);
1537+ cifs_server_unlock(server);
15381538 return rc;
15391539 }
15401540
15411541 rc = cifs_sign_smb(in_buf, server, &midQ->sequence_number);
15421542 if (rc) {
15431543 cifs_delete_mid(midQ);
1544− mutex_unlock(&server->srv_mutex);
1544+ cifs_server_unlock(server);
15451545 return rc;
15461546 }
15471547
@@ -1554,7 +1554,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, · 6 unmodified lines
15541554 if (rc < 0)
15551555 server->sequence_number -= 2;
15561556
1557− mutex_unlock(&server->srv_mutex);
1557+ cifs_server_unlock(server);
15581558
15591559 if (rc < 0) {
15601560 cifs_delete_mid(midQ);

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