mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
ksmbd: fix translation in smb2_populate_readdir_entry()
When transferring ownership information to the client the k*ids are translated into raw *ids before they are sent over the wire. The function currently erroneously translates the k*ids according to the mount's idmapping. Instead, reporting the owning *ids to userspace the underlying k*ids need to be mapped up in the caller's user namespace. This is how stat() works. The caller in this instance is ksmbd itself and ksmbd always runs in the initial user namespace. Translate according to that. The idmapping of the mount is already taken into account by the lower filesystem and so kstat->*id will contain the mapped k*ids. Switch to from_k*id_munged() which ensures that the overflow*id is returned instead of the (*id_t)-1 when the k*id can't be translated. Cc: Steve French <stfrench@microsoft.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Namjae Jeon <namjae.jeon@samsung.com> Cc: Hyunchul Lee <hyc.lee@gmail.com> Cc: Sergey Senozhatsky <senozhatsky@chromium.org> Cc: linux-cifs@vger.kernel.org Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> Signed-off-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
parent
da1e7ada5b
commit
475d6f9880
@ -3324,7 +3324,6 @@ static int dentry_name(struct ksmbd_dir_info *d_info, int info_level)
|
||||
*/
|
||||
static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
|
||||
struct ksmbd_dir_info *d_info,
|
||||
struct user_namespace *user_ns,
|
||||
struct ksmbd_kstat *ksmbd_kstat)
|
||||
{
|
||||
int next_entry_offset = 0;
|
||||
@ -3478,9 +3477,9 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
|
||||
S_ISDIR(ksmbd_kstat->kstat->mode) ? ATTR_DIRECTORY_LE : ATTR_ARCHIVE_LE;
|
||||
if (d_info->hide_dot_file && d_info->name[0] == '.')
|
||||
posix_info->DosAttributes |= ATTR_HIDDEN_LE;
|
||||
id_to_sid(from_kuid(user_ns, ksmbd_kstat->kstat->uid),
|
||||
id_to_sid(from_kuid_munged(&init_user_ns, ksmbd_kstat->kstat->uid),
|
||||
SIDNFS_USER, (struct smb_sid *)&posix_info->SidBuffer[0]);
|
||||
id_to_sid(from_kgid(user_ns, ksmbd_kstat->kstat->gid),
|
||||
id_to_sid(from_kgid_munged(&init_user_ns, ksmbd_kstat->kstat->gid),
|
||||
SIDNFS_GROUP, (struct smb_sid *)&posix_info->SidBuffer[20]);
|
||||
memcpy(posix_info->name, conv_name, conv_len);
|
||||
posix_info->name_len = cpu_to_le32(conv_len);
|
||||
@ -3571,7 +3570,6 @@ static int process_query_dir_entries(struct smb2_query_dir_private *priv)
|
||||
rc = smb2_populate_readdir_entry(priv->work->conn,
|
||||
priv->info_level,
|
||||
priv->d_info,
|
||||
user_ns,
|
||||
&ksmbd_kstat);
|
||||
dput(dent);
|
||||
if (rc)
|
||||
|
@ -291,7 +291,6 @@ int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level,
|
||||
char *search_pattern,
|
||||
int (*fn)(struct ksmbd_conn *, int,
|
||||
struct ksmbd_dir_info *,
|
||||
struct user_namespace *,
|
||||
struct ksmbd_kstat *))
|
||||
{
|
||||
int i, rc = 0;
|
||||
@ -322,8 +321,7 @@ int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level,
|
||||
user_ns,
|
||||
dir->filp->f_path.dentry->d_parent,
|
||||
&ksmbd_kstat);
|
||||
rc = fn(conn, info_level, d_info,
|
||||
user_ns, &ksmbd_kstat);
|
||||
rc = fn(conn, info_level, d_info, &ksmbd_kstat);
|
||||
if (rc)
|
||||
break;
|
||||
if (d_info->out_buf_len <= 0)
|
||||
|
@ -511,7 +511,6 @@ int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work,
|
||||
int (*fn)(struct ksmbd_conn *,
|
||||
int,
|
||||
struct ksmbd_dir_info *,
|
||||
struct user_namespace *,
|
||||
struct ksmbd_kstat *));
|
||||
|
||||
int ksmbd_extract_shortname(struct ksmbd_conn *conn,
|
||||
|
Loading…
Reference in New Issue
Block a user