From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Feb 2023 22:17:27 +0000 (-0800)
Subject: Merge tag '6.3-rc-ksmbd-fixes' of git://git.samba.org/ksmbd
X-Git-Tag: v6.6.7~3467
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25ac8c12ff7886e3d9b99feb85c53302a3cc5556;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag '6.3-rc-ksmbd-fixes' of git://git.samba.org/ksmbd

Pull ksmbd server updates from Steve French:

 - Fix for memory leak

 - Two important fixes for frame length checks (which are also now
   stricter)

 - four minor cleanup fixes

 - Fix to clarify ksmbd/Kconfig to indent properl

 - Conversion of the channel list and rpc handle list to xarrays

* tag '6.3-rc-ksmbd-fixes' of git://git.samba.org/ksmbd:
  ksmbd: fix possible memory leak in smb2_lock()
  ksmbd: do not allow the actual frame length to be smaller than the rfc1002 length
  ksmbd: fix wrong data area length for smb2 lock request
  ksmbd: Fix parameter name and comment mismatch
  ksmbd: Fix spelling mistake "excceed" -> "exceeded"
  ksmbd: update Kconfig to note Kerberos support and fix indentation
  ksmbd: Remove duplicated codes
  ksmbd: fix typo, syncronous->synchronous
  ksmbd: Implements sess->rpc_handle_list as xarray
  ksmbd: Implements sess->ksmbd_chann_list as xarray
---

25ac8c12ff7886e3d9b99feb85c53302a3cc5556
diff --cc fs/ksmbd/vfs.c
index aa1300b,0f0d615..5ea9229
--- a/fs/ksmbd/vfs.c
+++ b/fs/ksmbd/vfs.c
@@@ -950,11 -949,11 +950,11 @@@ ssize_t ksmbd_vfs_getxattr(struct mnt_i
  
  /**
   * ksmbd_vfs_setxattr() - vfs helper for smb set extended attributes value
 - * @user_ns:	user namespace
 + * @idmap:	idmap of the relevant mount
   * @dentry:	dentry to set XATTR at
-  * @name:	xattr name for setxattr
-  * @value:	xattr value to set
-  * @size:	size of xattr value
+  * @attr_name:	xattr name for setxattr
+  * @attr_value:	xattr value to set
+  * @attr_size:	size of xattr value
   * @flags:	destination buffer length
   *
   * Return:	0 on success, otherwise error