Skip to content

Commit 4860abb

Browse files
author
Steve French
committed
smb: Fix regression in writes when non-standard maximum write size negotiated
The conversion to netfs in the 6.3 kernel caused a regression when maximum write size is set by the server to an unexpected value which is not a multiple of 4096 (similarly if the user overrides the maximum write size by setting mount parm "wsize", but sets it to a value that is not a multiple of 4096). When negotiated write size is not a multiple of 4096 the netfs code can skip the end of the final page when doing large sequential writes, causing data corruption. This section of code is being rewritten/removed due to a large netfs change, but until that point (ie for the 6.3 kernel until now) we can not support non-standard maximum write sizes. Add a warning if a user specifies a wsize on mount that is not a multiple of 4096 (and round down), also add a change where we round down the maximum write size if the server negotiates a value that is not a multiple of 4096 (we also have to check to make sure that we do not round it down to zero). Reported-by: R. Diez" <rdiez-2006@rd10.de> Fixes: d08089f ("cifs: Change the I/O paths to use an iterator rather than a page list") Suggested-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> Acked-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> Tested-by: Matthew Ruffell <matthew.ruffell@canonical.com> Reviewed-by: Shyam Prasad N <sprasad@microsoft.com> Cc: stable@vger.kernel.org # v6.3+ Cc: David Howells <dhowells@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 8bde59b commit 4860abb

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

fs/smb/client/connect.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3444,8 +3444,18 @@ int cifs_mount_get_tcon(struct cifs_mount_ctx *mnt_ctx)
34443444
* the user on mount
34453445
*/
34463446
if ((cifs_sb->ctx->wsize == 0) ||
3447-
(cifs_sb->ctx->wsize > server->ops->negotiate_wsize(tcon, ctx)))
3448-
cifs_sb->ctx->wsize = server->ops->negotiate_wsize(tcon, ctx);
3447+
(cifs_sb->ctx->wsize > server->ops->negotiate_wsize(tcon, ctx))) {
3448+
cifs_sb->ctx->wsize =
3449+
round_down(server->ops->negotiate_wsize(tcon, ctx), PAGE_SIZE);
3450+
/*
3451+
* in the very unlikely event that the server sent a max write size under PAGE_SIZE,
3452+
* (which would get rounded down to 0) then reset wsize to absolute minimum eg 4096
3453+
*/
3454+
if (cifs_sb->ctx->wsize == 0) {
3455+
cifs_sb->ctx->wsize = PAGE_SIZE;
3456+
cifs_dbg(VFS, "wsize too small, reset to minimum ie PAGE_SIZE, usually 4096\n");
3457+
}
3458+
}
34493459
if ((cifs_sb->ctx->rsize == 0) ||
34503460
(cifs_sb->ctx->rsize > server->ops->negotiate_rsize(tcon, ctx)))
34513461
cifs_sb->ctx->rsize = server->ops->negotiate_rsize(tcon, ctx);

fs/smb/client/fs_context.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,17 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
11111111
case Opt_wsize:
11121112
ctx->wsize = result.uint_32;
11131113
ctx->got_wsize = true;
1114+
if (ctx->wsize % PAGE_SIZE != 0) {
1115+
ctx->wsize = round_down(ctx->wsize, PAGE_SIZE);
1116+
if (ctx->wsize == 0) {
1117+
ctx->wsize = PAGE_SIZE;
1118+
cifs_dbg(VFS, "wsize too small, reset to minimum %ld\n", PAGE_SIZE);
1119+
} else {
1120+
cifs_dbg(VFS,
1121+
"wsize rounded down to %d to multiple of PAGE_SIZE %ld\n",
1122+
ctx->wsize, PAGE_SIZE);
1123+
}
1124+
}
11141125
break;
11151126
case Opt_acregmax:
11161127
ctx->acregmax = HZ * result.uint_32;

0 commit comments

Comments
 (0)