fix up queue-6.1/smb3-replace-smb2pdu-1-element-arrays-with-flex-arrays.patch

diff --git a/queue-6.1/smb3-replace-smb2pdu-1-element-arrays-with-flex-arrays.patch b/queue-6.1/smb3-replace-smb2pdu-1-element-arrays-with-flex-arrays.patch
index 1b0305b63f331463bb448c3112462266c88c715c..c7f04dcecfc920a77857d3a971fca90efe17ddcc 100644 (file)
--- a/queue-6.1/smb3-replace-smb2pdu-1-element-arrays-with-flex-arrays.patch
+++ b/queue-6.1/smb3-replace-smb2pdu-1-element-arrays-with-flex-arrays.patch
@@ -67,8 +67,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  fs/smb/client/smb2pdu.h  |    2 +-
  fs/smb/common/smb2pdu.h  |   42 ++++++++++++++++++++++++------------------
  fs/smb/server/smb2ops.c  |    8 ++++----
- fs/smb/server/smb2pdu.c  |    5 ++---
- 8 files changed, 47 insertions(+), 44 deletions(-)
+ fs/smb/server/smb2pdu.c  |    8 +++-----
+ 8 files changed, 48 insertions(+), 46 deletions(-)
 
 --- a/fs/smb/client/smb2file.c
 +++ b/fs/smb/client/smb2file.c
@@ -439,22 +439,25 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        .cap_nt_find = SMB2_NT_FIND,
 --- a/fs/smb/server/smb2pdu.c
 +++ b/fs/smb/server/smb2pdu.c
-@@ -295,7 +295,7 @@ int init_smb2_neg_rsp(struct ksmbd_work
+@@ -294,8 +294,7 @@ int init_smb2_neg_rsp(struct ksmbd_work
+       if (server_conf.signing == KSMBD_CONFIG_OPT_MANDATORY)
                rsp->SecurityMode |= SMB2_NEGOTIATE_SIGNING_REQUIRED_LE;
        err = ksmbd_iov_pin_rsp(work, rsp,
-                               sizeof(struct smb2_negotiate_rsp) -
+-                              sizeof(struct smb2_negotiate_rsp) -
 -                              sizeof(rsp->Buffer) + AUTH_GSS_LENGTH);
-+                              sizeof(struct smb2_hdr) + AUTH_GSS_LENGTH);
++                              sizeof(struct smb2_negotiate_rsp) + AUTH_GSS_LENGTH);
        if (err)
                return err;
        conn->use_spnego = true;
-@@ -1264,8 +1264,7 @@ err_out:
+@@ -1263,9 +1262,8 @@ err_out:
+ 
        if (!rc)
                rc = ksmbd_iov_pin_rsp(work, rsp,
-                                      sizeof(struct smb2_negotiate_rsp) -
+-                                     sizeof(struct smb2_negotiate_rsp) -
 -                                      sizeof(rsp->Buffer) +
 -                                      AUTH_GSS_LENGTH + neg_ctxt_len);
-+                                     sizeof(struct smb2_hdr) + AUTH_GSS_LENGTH + neg_ctxt_len);
++                                     sizeof(struct smb2_negotiate_rsp) +
++                                     AUTH_GSS_LENGTH + neg_ctxt_len);
        if (rc < 0)
                smb2_set_err_rsp(work);
        return rc;