mbox series

[v2,00/12] smb: fix some bugs, move duplicate definitions to common header file, and some small cleanups

Message ID 20240822082101.391272-1-chenxiaosong@chenxiaosong.com
Headers show
Series smb: fix some bugs, move duplicate definitions to common header file, and some small cleanups | expand

Message

ChenXiaoSong Aug. 22, 2024, 8:20 a.m. UTC 
From: ChenXiaoSong <chenxiaosong@kylinos.cn>

Fix some bugs in smb2_open() of smb server.

In order to maintain the code more easily, move some duplicate
definitions to common header file.

Additionally, add some small cleanups to the patchset.

v1->v2:
  - update patch #2 according to Namjae's suggestions.
  - add patch #6~9 to rename 'cifs_ntsd' 'cifs_sid' 'cifs_acl' 'cifs_ace' according to Namjae's suggestions.
  - add patch #12 to explained why the typo 'STATUS_MCA_OCCURED' was not corrected.

v1: https://lore.kernel.org/all/20240820143319.274033-1-chenxiaosong@chenxiaosong.com/

ChenXiaoSong (12):
  smb/server: fix return value of smb2_open()
  smb/server: fix potential null-ptr-deref of lease_ctx_info in
    smb2_open()
  smb/server: remove useless assignment of 'file_present' in smb2_open()
  smb/client: fix typo: GlobalMid_Sem -> GlobalMid_Lock
  smb/server: update misguided comment of smb2_allocate_rsp_buf()
  smb/client: rename cifs_ntsd to smb_ntsd
  smb/client: rename cifs_sid to smb_sid
  smb/client: rename cifs_acl to smb_acl
  smb/client: rename cifs_ace to smb_ace
  smb: move some duplicate definitions to common/smbacl.h
  smb: move SMB2 Status code to common header file
  smb: add comment to STATUS_MCA_OCCURED

 fs/smb/client/cifsacl.c                |  224 +--
 fs/smb/client/cifsacl.h                |   99 +-
 fs/smb/client/cifsfs.c                 |    6 +-
 fs/smb/client/cifsglob.h               |   22 +-
 fs/smb/client/cifsproto.h              |   18 +-
 fs/smb/client/cifssmb.c                |    6 +-
 fs/smb/client/smb2file.c               |    2 +-
 fs/smb/client/smb2inode.c              |    6 +-
 fs/smb/client/smb2maperror.c           |    2 +-
 fs/smb/client/smb2misc.c               |    2 +-
 fs/smb/client/smb2ops.c                |   16 +-
 fs/smb/client/smb2pdu.c                |   14 +-
 fs/smb/client/smb2pdu.h                |    8 +-
 fs/smb/client/smb2proto.h              |    2 +-
 fs/smb/client/smb2transport.c          |    2 +-
 fs/smb/client/xattr.c                  |    4 +-
 fs/smb/{client => common}/smb2status.h |    6 +
 fs/smb/common/smbacl.h                 |  121 ++
 fs/smb/server/oplock.c                 |    4 +-
 fs/smb/server/server.c                 |    2 +-
 fs/smb/server/smb2misc.c               |    2 +-
 fs/smb/server/smb2pdu.c                |   17 +-
 fs/smb/server/smb_common.c             |    2 +-
 fs/smb/server/smbacl.h                 |  111 +-
 fs/smb/server/smbstatus.h              | 1822 ------------------------
 fs/smb/server/transport_rdma.c         |    2 +-
 26 files changed, 314 insertions(+), 2208 deletions(-)
 rename fs/smb/{client => common}/smb2status.h (99%)
 create mode 100644 fs/smb/common/smbacl.h
 delete mode 100644 fs/smb/server/smbstatus.h

Comments

Steve French Aug. 22, 2024, 8:59 p.m. UTC | #1 
Merged patches 6, 7, 8, 9, 10, 11, 12 (the ones affecting the client
e.g.) into cifs-2.6.git for-next-next branch (for 6.12-rc) and added
Namjae's Reviewed-by for those that didn't already have it in the
commit description.

dc470593e459 (HEAD -> for-next-next) smb: add comment to STATUS_MCA_OCCURED
cda1ece3de80 smb: move SMB2 Status code to common header file
093aa95b1f89 smb: move some duplicate definitions to common/smbacl.h
ef90cd1c8858 smb/client: rename cifs_ace to smb_ace
0628feffddec smb/client: rename cifs_acl to smb_acl
d58459043a94 smb/client: rename cifs_sid to smb_sid
d8fa64617131 smb/client: rename cifs_ntsd to smb_ntsd
5e51224d2afb (origin/for-next, for-next) smb/client: fix typo:
GlobalMid_Sem -> GlobalMid_Lock

On Thu, Aug 22, 2024 at 3:25 AM <chenxiaosong@chenxiaosong.com> wrote:
>
> From: ChenXiaoSong <chenxiaosong@kylinos.cn>
>
> Fix some bugs in smb2_open() of smb server.
>
> In order to maintain the code more easily, move some duplicate
> definitions to common header file.
>
> Additionally, add some small cleanups to the patchset.
>
> v1->v2:
>   - update patch #2 according to Namjae's suggestions.
>   - add patch #6~9 to rename 'cifs_ntsd' 'cifs_sid' 'cifs_acl' 'cifs_ace' according to Namjae's suggestions.
>   - add patch #12 to explained why the typo 'STATUS_MCA_OCCURED' was not corrected.
>
> v1: https://lore.kernel.org/all/20240820143319.274033-1-chenxiaosong@chenxiaosong.com/
>
> ChenXiaoSong (12):
>   smb/server: fix return value of smb2_open()
>   smb/server: fix potential null-ptr-deref of lease_ctx_info in
>     smb2_open()
>   smb/server: remove useless assignment of 'file_present' in smb2_open()
>   smb/client: fix typo: GlobalMid_Sem -> GlobalMid_Lock
>   smb/server: update misguided comment of smb2_allocate_rsp_buf()
>   smb/client: rename cifs_ntsd to smb_ntsd
>   smb/client: rename cifs_sid to smb_sid
>   smb/client: rename cifs_acl to smb_acl
>   smb/client: rename cifs_ace to smb_ace
>   smb: move some duplicate definitions to common/smbacl.h
>   smb: move SMB2 Status code to common header file
>   smb: add comment to STATUS_MCA_OCCURED
>
>  fs/smb/client/cifsacl.c                |  224 +--
>  fs/smb/client/cifsacl.h                |   99 +-
>  fs/smb/client/cifsfs.c                 |    6 +-
>  fs/smb/client/cifsglob.h               |   22 +-
>  fs/smb/client/cifsproto.h              |   18 +-
>  fs/smb/client/cifssmb.c                |    6 +-
>  fs/smb/client/smb2file.c               |    2 +-
>  fs/smb/client/smb2inode.c              |    6 +-
>  fs/smb/client/smb2maperror.c           |    2 +-
>  fs/smb/client/smb2misc.c               |    2 +-
>  fs/smb/client/smb2ops.c                |   16 +-
>  fs/smb/client/smb2pdu.c                |   14 +-
>  fs/smb/client/smb2pdu.h                |    8 +-
>  fs/smb/client/smb2proto.h              |    2 +-
>  fs/smb/client/smb2transport.c          |    2 +-
>  fs/smb/client/xattr.c                  |    4 +-
>  fs/smb/{client => common}/smb2status.h |    6 +
>  fs/smb/common/smbacl.h                 |  121 ++
>  fs/smb/server/oplock.c                 |    4 +-
>  fs/smb/server/server.c                 |    2 +-
>  fs/smb/server/smb2misc.c               |    2 +-
>  fs/smb/server/smb2pdu.c                |   17 +-
>  fs/smb/server/smb_common.c             |    2 +-
>  fs/smb/server/smbacl.h                 |  111 +-
>  fs/smb/server/smbstatus.h              | 1822 ------------------------
>  fs/smb/server/transport_rdma.c         |    2 +-
>  26 files changed, 314 insertions(+), 2208 deletions(-)
>  rename fs/smb/{client => common}/smb2status.h (99%)
>  create mode 100644 fs/smb/common/smbacl.h
>  delete mode 100644 fs/smb/server/smbstatus.h
>
> --
> 2.34.1
>
>
Steve French Sept. 10, 2024, 6:36 a.m. UTC | #2 
The following patches from the series have been added to cifs-2.6.git
for-next (the other patches in the series were either for fs/smb/server
rather than the client, or have already been merged).  Let me know
if any objections or problems seen.

d837dec2296c smb: add comment to STATUS_MCA_OCCURED
15dd39d9da2b smb: move SMB2 Status code to common header file
5ce486228d95 smb: move some duplicate definitions to common/smbacl.h
1e4b28faf320 smb/client: rename cifs_ace to smb_ace
664987e5e550 smb/client: rename cifs_acl to smb_acl
624d2ce94277 smb/client: rename cifs_sid to smb_sid
8335848d54c1 smb/client: rename cifs_ntsd to smb_ntsd

On Thu, Aug 22, 2024 at 3:25 AM <chenxiaosong@chenxiaosong.com> wrote:
>
> From: ChenXiaoSong <chenxiaosong@kylinos.cn>
>
> Fix some bugs in smb2_open() of smb server.
>
> In order to maintain the code more easily, move some duplicate
> definitions to common header file.
>
> Additionally, add some small cleanups to the patchset.
>
> v1->v2:
>   - update patch #2 according to Namjae's suggestions.
>   - add patch #6~9 to rename 'cifs_ntsd' 'cifs_sid' 'cifs_acl' 'cifs_ace' according to Namjae's suggestions.
>   - add patch #12 to explained why the typo 'STATUS_MCA_OCCURED' was not corrected.
>
> v1: https://lore.kernel.org/all/20240820143319.274033-1-chenxiaosong@chenxiaosong.com/
>
> ChenXiaoSong (12):
>   smb/server: fix return value of smb2_open()
>   smb/server: fix potential null-ptr-deref of lease_ctx_info in
>     smb2_open()
>   smb/server: remove useless assignment of 'file_present' in smb2_open()
>   smb/client: fix typo: GlobalMid_Sem -> GlobalMid_Lock
>   smb/server: update misguided comment of smb2_allocate_rsp_buf()
>   smb/client: rename cifs_ntsd to smb_ntsd
>   smb/client: rename cifs_sid to smb_sid
>   smb/client: rename cifs_acl to smb_acl
>   smb/client: rename cifs_ace to smb_ace
>   smb: move some duplicate definitions to common/smbacl.h
>   smb: move SMB2 Status code to common header file
>   smb: add comment to STATUS_MCA_OCCURED
>
>  fs/smb/client/cifsacl.c                |  224 +--
>  fs/smb/client/cifsacl.h                |   99 +-
>  fs/smb/client/cifsfs.c                 |    6 +-
>  fs/smb/client/cifsglob.h               |   22 +-
>  fs/smb/client/cifsproto.h              |   18 +-
>  fs/smb/client/cifssmb.c                |    6 +-
>  fs/smb/client/smb2file.c               |    2 +-
>  fs/smb/client/smb2inode.c              |    6 +-
>  fs/smb/client/smb2maperror.c           |    2 +-
>  fs/smb/client/smb2misc.c               |    2 +-
>  fs/smb/client/smb2ops.c                |   16 +-
>  fs/smb/client/smb2pdu.c                |   14 +-
>  fs/smb/client/smb2pdu.h                |    8 +-
>  fs/smb/client/smb2proto.h              |    2 +-
>  fs/smb/client/smb2transport.c          |    2 +-
>  fs/smb/client/xattr.c                  |    4 +-
>  fs/smb/{client => common}/smb2status.h |    6 +
>  fs/smb/common/smbacl.h                 |  121 ++
>  fs/smb/server/oplock.c                 |    4 +-
>  fs/smb/server/server.c                 |    2 +-
>  fs/smb/server/smb2misc.c               |    2 +-
>  fs/smb/server/smb2pdu.c                |   17 +-
>  fs/smb/server/smb_common.c             |    2 +-
>  fs/smb/server/smbacl.h                 |  111 +-
>  fs/smb/server/smbstatus.h              | 1822 ------------------------
>  fs/smb/server/transport_rdma.c         |    2 +-
>  26 files changed, 314 insertions(+), 2208 deletions(-)
>  rename fs/smb/{client => common}/smb2status.h (99%)
>  create mode 100644 fs/smb/common/smbacl.h
>  delete mode 100644 fs/smb/server/smbstatus.h
>
> --
> 2.34.1
>
>