@@ -483,6 +483,7 @@ static int reconnect_target_unlocked(struct TCP_Server_Info *server, struct dfs_
483483static int reconnect_dfs_server (struct TCP_Server_Info * server )
484484{
485485 struct dfs_cache_tgt_iterator * target_hint = NULL ;
486+
486487 DFS_CACHE_TGT_LIST (tl );
487488 int num_targets = 0 ;
488489 int rc = 0 ;
@@ -745,6 +746,7 @@ cifs_read_from_socket(struct TCP_Server_Info *server, char *buf,
745746{
746747 struct msghdr smb_msg = {};
747748 struct kvec iov = {.iov_base = buf , .iov_len = to_read };
749+
748750 iov_iter_kvec (& smb_msg .msg_iter , ITER_DEST , & iov , 1 , to_read );
749751
750752 return cifs_readv_from_socket (server , & smb_msg );
@@ -1400,11 +1402,13 @@ cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs)
14001402 case AF_INET : {
14011403 struct sockaddr_in * saddr4 = (struct sockaddr_in * )srcaddr ;
14021404 struct sockaddr_in * vaddr4 = (struct sockaddr_in * )rhs ;
1405+
14031406 return (saddr4 -> sin_addr .s_addr == vaddr4 -> sin_addr .s_addr );
14041407 }
14051408 case AF_INET6 : {
14061409 struct sockaddr_in6 * saddr6 = (struct sockaddr_in6 * )srcaddr ;
14071410 struct sockaddr_in6 * vaddr6 = (struct sockaddr_in6 * )rhs ;
1411+
14081412 return (ipv6_addr_equal (& saddr6 -> sin6_addr , & vaddr6 -> sin6_addr )
14091413 && saddr6 -> sin6_scope_id == vaddr6 -> sin6_scope_id );
14101414 }
@@ -2599,8 +2603,8 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx)
25992603 rc = - EOPNOTSUPP ;
26002604 goto out_fail ;
26012605 } else {
2602- cifs_dbg (VFS , "Check vers= mount option. SMB3.11 "
2603- "disabled but required for POSIX extensions\n" );
2606+ cifs_dbg (VFS ,
2607+ "Check vers= mount option. SMB3.11 disabled but required for POSIX extensions\n" );
26042608 rc = - EOPNOTSUPP ;
26052609 goto out_fail ;
26062610 }
@@ -2743,7 +2747,6 @@ cifs_put_tlink(struct tcon_link *tlink)
27432747 if (!IS_ERR (tlink_tcon (tlink )))
27442748 cifs_put_tcon (tlink_tcon (tlink ));
27452749 kfree (tlink );
2746- return ;
27472750}
27482751
27492752static int
@@ -2884,6 +2887,7 @@ static inline void
28842887cifs_reclassify_socket4 (struct socket * sock )
28852888{
28862889 struct sock * sk = sock -> sk ;
2890+
28872891 BUG_ON (!sock_allow_reclassification (sk ));
28882892 sock_lock_init_class_and_name (sk , "slock-AF_INET-CIFS" ,
28892893 & cifs_slock_key [0 ], "sk_lock-AF_INET-CIFS" , & cifs_key [0 ]);
@@ -2893,6 +2897,7 @@ static inline void
28932897cifs_reclassify_socket6 (struct socket * sock )
28942898{
28952899 struct sock * sk = sock -> sk ;
2900+
28962901 BUG_ON (!sock_allow_reclassification (sk ));
28972902 sock_lock_init_class_and_name (sk , "slock-AF_INET6-CIFS" ,
28982903 & cifs_slock_key [1 ], "sk_lock-AF_INET6-CIFS" , & cifs_key [1 ]);
@@ -2927,15 +2932,18 @@ static int
29272932bind_socket (struct TCP_Server_Info * server )
29282933{
29292934 int rc = 0 ;
2935+
29302936 if (server -> srcaddr .ss_family != AF_UNSPEC ) {
29312937 /* Bind to the specified local IP address */
29322938 struct socket * socket = server -> ssocket ;
2939+
29332940 rc = kernel_bind (socket ,
29342941 (struct sockaddr * ) & server -> srcaddr ,
29352942 sizeof (server -> srcaddr ));
29362943 if (rc < 0 ) {
29372944 struct sockaddr_in * saddr4 ;
29382945 struct sockaddr_in6 * saddr6 ;
2946+
29392947 saddr4 = (struct sockaddr_in * )& server -> srcaddr ;
29402948 saddr6 = (struct sockaddr_in6 * )& server -> srcaddr ;
29412949 if (saddr6 -> sin6_family == AF_INET6 )
@@ -3165,6 +3173,7 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon,
31653173
31663174 if (!CIFSSMBQFSUnixInfo (xid , tcon )) {
31673175 __u64 cap = le64_to_cpu (tcon -> fsUnixInfo .Capability );
3176+
31683177 cifs_dbg (FYI , "unix caps which server supports %lld\n" , cap );
31693178 /*
31703179 * check for reconnect case in which we do not
@@ -3668,7 +3677,7 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses,
36683677 smb_buffer_response = smb_buffer ;
36693678
36703679 header_assemble (smb_buffer , SMB_COM_TREE_CONNECT_ANDX ,
3671- NULL /*no tid */ , 4 /*wct */ );
3680+ NULL /*no tid */ , 4 /*wct */ );
36723681
36733682 smb_buffer -> Mid = get_next_mid (ses -> server );
36743683 smb_buffer -> Uid = ses -> Suid ;
@@ -3687,12 +3696,12 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses,
36873696 if (ses -> server -> sign )
36883697 smb_buffer -> Flags2 |= SMBFLG2_SECURITY_SIGNATURE ;
36893698
3690- if (ses -> capabilities & CAP_STATUS32 ) {
3699+ if (ses -> capabilities & CAP_STATUS32 )
36913700 smb_buffer -> Flags2 |= SMBFLG2_ERR_STATUS ;
3692- }
3693- if (ses -> capabilities & CAP_DFS ) {
3701+
3702+ if (ses -> capabilities & CAP_DFS )
36943703 smb_buffer -> Flags2 |= SMBFLG2_DFS ;
3695- }
3704+
36963705 if (ses -> capabilities & CAP_UNICODE ) {
36973706 smb_buffer -> Flags2 |= SMBFLG2_UNICODE ;
36983707 length =
0 commit comments