[PATCH 2/2] cifs: limit amount of data we request for xattrs to CIFSMaxBufSize

Steve French smfrench at gmail.com
Thu Jan 24 16:08:35 UTC 2019


Merged into cifs-2.6.git for-next and now testing this with the
buildbot (along the 11 other fixes in for-next, more than half from
Pavel's compounding series, many of them very important and marked for
stable).

Making good progress on cleaning up bugs prior to the (SNIA Europe)
SMB3 test event next week.   The list of xfstests that pass (e.g.
cifs.ko to Samba or Azure or Windows or Macs) continues to increase.

On Thu, Jan 24, 2019 at 12:19 AM Ronnie Sahlberg <lsahlber at redhat.com> wrote:
>
> or else we might trigger a session reconnect.
>
> Signed-off-by: Ronnie Sahlberg <lsahlber at redhat.com>
> ---
>  fs/cifs/smb2ops.c | 2 +-
>  fs/cifs/smb2pdu.h | 2 --
>  2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index 34f621fe6dc0..32f19a97c750 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -905,7 +905,7 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon,
>                                       FILE_READ_EA,
>                                       FILE_FULL_EA_INFORMATION,
>                                       SMB2_O_INFO_FILE,
> -                                     SMB2_MAX_EA_BUF,
> +                                     CIFSMaxBufSize,
>                                       &rsp_iov, &buftype, cifs_sb);
>         if (rc) {
>                 /*
> diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
> index 05dea6750c33..c0abe9908014 100644
> --- a/fs/cifs/smb2pdu.h
> +++ b/fs/cifs/smb2pdu.h
> @@ -1398,8 +1398,6 @@ struct smb2_file_link_info { /* encoding of request for level 11 */
>         char   FileName[0];     /* Name to be assigned to new link */
>  } __packed; /* level 11 Set */
>
> -#define SMB2_MAX_EA_BUF 65536
> -
>  struct smb2_file_full_ea_info { /* encoding of response for level 15 */
>         __le32 next_entry_offset;
>         __u8   flags;
> --
> 2.13.6
>


-- 
Thanks,

Steve



More information about the samba-technical mailing list