2023-07-29 20:19:13

by Steve French

[permalink] [raw]
Subject: [GIT PULL] smb3 client fixes

Please pull the following changes since commit
6eaae198076080886b9e7d57f4ae06fa782f90ef:

Linux 6.5-rc3 (2023-07-23 15:24:10 -0700)

are available in the Git repository at:

git://git.samba.org/sfrench/cifs-2.6.git tags/6.5-rc3-smb3-client-fixes

for you to fetch changes up to a171eb5cac427fa8d084eaf5e47fbe4c0f1e279f:

cifs: add missing return value check for cifs_sb_tlink (2023-07-26
15:41:27 -0500)

----------------------------------------------------------------
Four small SMB3 client fixes
- two reconnect fixes (to address the case where non-default iocharset
gets incorrectly overridden at reconnect with the default charset)
- fix for NTLMSSP_AUTH request setting a flag incorrectly)
- Add missing check for invalid tlink (tree connection) in ioctl

----------------------------------------------------------------
Shyam Prasad N (1):
cifs: add missing return value check for cifs_sb_tlink

Steve French (1):
smb3: do not set NTLMSSP_VERSION flag for negotiate not auth request

Winston Wen (2):
fs/nls: make load_nls() take a const parameter
cifs: fix charset issue in reconnection

fs/nls/nls_base.c | 4 ++--
fs/smb/client/cifsglob.h | 1 +
fs/smb/client/cifssmb.c | 3 +--
fs/smb/client/connect.c | 5 +++++
fs/smb/client/ioctl.c | 5 +++++
fs/smb/client/misc.c | 1 +
fs/smb/client/sess.c | 4 +++-
fs/smb/client/smb2pdu.c | 3 +--
include/linux/nls.h | 2 +-
9 files changed, 20 insertions(+), 8 deletions(-)


--
Thanks,

Steve


2023-07-30 04:01:00

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] smb3 client fixes

The pull request you sent on Sat, 29 Jul 2023 14:07:53 -0500:

> git://git.samba.org/sfrench/cifs-2.6.git tags/6.5-rc3-smb3-client-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d31e3792919e5c97d572c8a27a5a7c1eb9de5aca

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

2023-08-31 11:41:17

by Dr. David Alan Gilbert

[permalink] [raw]
Subject: Re: [GIT PULL] smb3 client fixes

* Linus Torvalds ([email protected]) wrote:
> On Wed, 30 Aug 2023 at 13:48, Steve French <[email protected]> wrote:
> >
> > - move UCS-2 conversion code to fs/nls and update cifs.ko and jfs.ko to use them
>
> I've pulled this, but I think the new NLS_UCS2_UTILS config option
> shouldn't be something that is asked about. The filesystems that want
> it already select it, and users shouldn't be asked about a module with
> no use.
>
> The way to do that is to simply not have a user query string for it,
> ie instead of
>
> config NLS_UCS2_UTILS
> tristate "NLS UCS-2 UTILS"
>
> it could be (an dI think should be) just
>
> config NLS_UCS2_UTILS
> tristate
>
> which tells the config system not to ask users about it.
>
> Because users really shouldn't be asked questions that there is no point in.

Agreed.
I'll check it today and send a patch.

Thanks,

Dave

>
> And then, on a purely visual commentary about your pull request -
> lines like these are just noise:
>
> > fs/{smb/server/uniupr.h => nls/nls_ucs2_utils.c} | 156
> > +++++-------------------------------------
> > fs/nls/nls_ucs2_utils.h | 285
> > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>
> and the problem seems to be that you generate the diffstat in a very
> wide terminal (where git tries to be helpful and give you lots of
> detail), and then you cut-and-paste the result.
>
> If you pipe it to a tool instead (xsel, perhaps), git will limit the
> width of the diffstat to something sane.
>
> Or, if you really want to use a terminal and cut-and-paste it
> manually, you could try to tell git to use '--stat=72' to limit the
> stat to 72 characters (which is the canonical "width for email", as
> the Lord spake unto us all in rfc822, even if the Lord was confused
> and also mentioned the number 65).
>
> Linus
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/

2023-09-10 06:59:40

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] smb3 client fixes

The pull request you sent on Sat, 9 Sep 2023 20:36:18 -0500:

> git://git.samba.org/sfrench/cifs-2.6.git tags/6.6-rc-smb3-client-fixes-part2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/fd3a5940e66d059d375bdb9e2d7d06c56f630d7e

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html