Skip to content

Commit f6513bd

Browse files
committed
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()
2 parents 37711e5 + c8c412f commit f6513bd

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

fs/cifs/connect.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4886,6 +4886,7 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *vol)
48864886
full_path = build_unc_path_to_root(vol, cifs_sb, !!count);
48874887
if (IS_ERR(full_path)) {
48884888
rc = PTR_ERR(full_path);
4889+
full_path = NULL;
48894890
break;
48904891
}
48914892
/* Chase referral */

fs/cifs/smb2inode.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
115115
vars->oparms.fid = &fid;
116116
vars->oparms.reconnect = false;
117117
vars->oparms.mode = mode;
118+
vars->oparms.cifs_sb = cifs_sb;
118119

119120
rqst[num_rqst].rq_iov = &vars->open_iov[0];
120121
rqst[num_rqst].rq_nvec = SMB2_CREATE_IOV_SIZE;

fs/cifs/smb2pdu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3913,7 +3913,7 @@ smb2_readv_callback(struct mid_q_entry *mid)
39133913
case MID_RESPONSE_MALFORMED:
39143914
credits.value = le16_to_cpu(shdr->CreditRequest);
39153915
credits.instance = server->reconnect_instance;
3916-
/* fall through */
3916+
fallthrough;
39173917
default:
39183918
rdata->result = -EIO;
39193919
}
@@ -4146,7 +4146,7 @@ smb2_writev_callback(struct mid_q_entry *mid)
41464146
case MID_RESPONSE_MALFORMED:
41474147
credits.value = le16_to_cpu(rsp->sync_hdr.CreditRequest);
41484148
credits.instance = server->reconnect_instance;
4149-
/* fall through */
4149+
fallthrough;
41504150
default:
41514151
wdata->result = -EIO;
41524152
break;

0 commit comments

Comments
 (0)