Skip to content

Commit d78840a

Browse files
bharathsm-mssmfrench
authored andcommitted
smb: client: fix in-place encryption corruption in SMB2_write()
SMB2_write() places write payload in iov[1..n] as part of rq_iov. smb3_init_transform_rq() pointer-shares rq_iov, so crypt_message() encrypts iov[1] in-place, replacing the original plaintext with ciphertext. On a replayable error, the retry sends the same iov[1] which now contains ciphertext instead of the original data, resulting in corruption. The corruption is most likely to be observed when connections are unstable, as reconnects trigger write retries that re-send the already-encrypted data. This affects SFU mknod, MF symlinks, etc. On kernels before 6.10 (prior to the netfs conversion), sync writes also used this path and were similarly affected. The async write path wasn't unaffected as it uses rq_iter which gets deep-copied. Fix by moving the write payload into rq_iter via iov_iter_kvec(), so smb3_init_transform_rq() deep-copies it before encryption. Cc: stable@vger.kernel.org khadas#6.3+ Acked-by: Henrique Carvalho <henrique.carvalho@suse.com> Acked-by: Shyam Prasad N <sprasad@microsoft.com> Acked-by: Paulo Alcantara (Red Hat) <pc@manguebit.org> Signed-off-by: Bharath SM <bharathsm@microsoft.com> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent fae1133 commit d78840a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

fs/smb/client/smb2pdu.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5307,7 +5307,10 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
53075307

53085308
memset(&rqst, 0, sizeof(struct smb_rqst));
53095309
rqst.rq_iov = iov;
5310-
rqst.rq_nvec = n_vec + 1;
5310+
/* iov[0] is the SMB header; move payload to rq_iter for encryption safety */
5311+
rqst.rq_nvec = 1;
5312+
iov_iter_kvec(&rqst.rq_iter, ITER_SOURCE, &iov[1], n_vec,
5313+
io_parms->length);
53115314

53125315
if (retries) {
53135316
/* Back-off before retry */

0 commit comments

Comments
 (0)