diff options
| author |   Paulo Alcantara <pc@manguebit.com> | 2025-05-12 14:58:36 -0300 |
|---|---|---|
| committer |   Steve French <stfrench@microsoft.com> | 2025-05-14 19:26:38 -0500 |
| commit | 3965c23773e81c476f6de30ccc5d201c59ff9714 (patch) | |
| tree | f94b1ede623677d9638d64fb1be4af71caa4179a /fs/smb/client/file.c | |
| parent | smb: client: fix memory leak during error handling for POSIX mkdir (diff) | |
| download | wireguard-linux-3965c23773e81c476f6de30ccc5d201c59ff9714.tar.xz wireguard-linux-3965c23773e81c476f6de30ccc5d201c59ff9714.zip | |
smb: client: fix zero rsize error messages
cifs_prepare_read() might be called with a disconnected channel, where
TCP_Server_Info::max_read is set to zero due to reconnect, so calling
->negotiate_rize() will set @rsize to default min IO size (64KiB) and
then logging
CIFS: VFS: SMB: Zero rsize calculated, using minimum value
65536
If the reconnect happens in cifsd thread, cifs_renegotiate_iosize()
will end up being called and then @rsize set to the expected value.
Since we can't rely on the value of @server->max_read by the time we
call cifs_prepare_read(), try to ->negotiate_rize() only if
@cifs_sb->ctx->rsize is zero.
Reported-by: Steve French <stfrench@microsoft.com>
Fixes: c59f7c9661b9 ("smb: client: ensure aligned IO sizes")
Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/smb/client/file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index 851b74f557c1..950aa4f912f5 100644 --- a/fs/smb/client/file.c +++ b/fs/smb/client/file.c @@ -160,8 +160,10 @@ static int cifs_prepare_read(struct netfs_io_subrequest *subreq) server = cifs_pick_channel(tlink_tcon(req->cfile->tlink)->ses); rdata->server = server; - cifs_negotiate_rsize(server, cifs_sb->ctx, - tlink_tcon(req->cfile->tlink)); + if (cifs_sb->ctx->rsize == 0) { + cifs_negotiate_rsize(server, cifs_sb->ctx, + tlink_tcon(req->cfile->tlink)); + } rc = server->ops->wait_mtu_credits(server, cifs_sb->ctx->rsize, &size, &rdata->credits); |