Merge tag '5.9-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French: "Three small cifs/smb3 fixes, one for stable fixing mkdir path with the 'idsfromsid' mount option" * tag '5.9-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6: SMB3: Fix mkdir when idsfromsid configured on mount cifs: Convert to use the fallthrough macro cifs: Fix an error pointer dereference in cifs_mount()
This commit is contained in:
@@ -4886,6 +4886,7 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *vol)
|
||||
full_path = build_unc_path_to_root(vol, cifs_sb, !!count);
|
||||
if (IS_ERR(full_path)) {
|
||||
rc = PTR_ERR(full_path);
|
||||
full_path = NULL;
|
||||
break;
|
||||
}
|
||||
/* Chase referral */
|
||||
|
||||
@@ -115,6 +115,7 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
|
||||
vars->oparms.fid = &fid;
|
||||
vars->oparms.reconnect = false;
|
||||
vars->oparms.mode = mode;
|
||||
vars->oparms.cifs_sb = cifs_sb;
|
||||
|
||||
rqst[num_rqst].rq_iov = &vars->open_iov[0];
|
||||
rqst[num_rqst].rq_nvec = SMB2_CREATE_IOV_SIZE;
|
||||
|
||||
+2
-2
@@ -3913,7 +3913,7 @@ smb2_readv_callback(struct mid_q_entry *mid)
|
||||
case MID_RESPONSE_MALFORMED:
|
||||
credits.value = le16_to_cpu(shdr->CreditRequest);
|
||||
credits.instance = server->reconnect_instance;
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
default:
|
||||
rdata->result = -EIO;
|
||||
}
|
||||
@@ -4146,7 +4146,7 @@ smb2_writev_callback(struct mid_q_entry *mid)
|
||||
case MID_RESPONSE_MALFORMED:
|
||||
credits.value = le16_to_cpu(rsp->sync_hdr.CreditRequest);
|
||||
credits.instance = server->reconnect_instance;
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
default:
|
||||
wdata->result = -EIO;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user