dynamic_dname(): drop unused dentry argument
Subsystems (11)
Al Viro
maintainerPATCH 1/5 dynamic_dname(): drop unused dentry argument
--- drivers/dma-buf/dma-buf.c | 2 +- fs/anon_inodes.c | 2 +- fs/d_path.c | 3 +-- fs/nsfs.c | 2 +- fs/pipe.c | 2 +- include/linux/dcache.h | 4 ++-- net/socket.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-)
drivers/dma-buf/dma-buf.c +1 -1
@@ -53,7 +53,7 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) ret =strlcpy (name, dmabuf->name,DMA_BUF_NAME_LEN );spin_unlock (&dmabuf->name_lock); -return dynamic_dname (dentry, buffer, buflen,"/%s:%s" , +return dynamic_dname (buffer, buflen,"/%s:%s" , dentry->d_name.name, ret >0 ? name :"" ); }
fs/anon_inodes.c +1 -1
@@ -32,7 +32,7 @@ static struct inode *anon_inode_inode;*/ static char *anon_inodefs_dname (struct dentry *dentry,char *buffer,int buflen) { -return dynamic_dname (dentry, buffer, buflen,"anon_inode:%s" , +return dynamic_dname (buffer, buflen,"anon_inode:%s" , dentry->d_name.name); }
fs/d_path.c +1 -2
@@ -297,8 +297,7 @@ EXPORT_SYMBOL(d_path);/* * Helper function for dentry_operations.d_dname() members */ -char *dynamic_dname (struct dentry *dentry,char *buffer,int buflen, -const char *fmt, ...) +char *dynamic_dname (char *buffer,int buflen,const char *fmt, ...) {va_list args;char temp[64 ];
fs/nsfs.c +1 -1
@@ -28,7 +28,7 @@ static char *ns_dname(struct dentry *dentry, char *buffer, int buflen)struct inode *inode =d_inode (dentry);const struct proc_ns_operations *ns_ops = dentry->d_fsdata; -return dynamic_dname (dentry, buffer, buflen,"%s:[%lu]" , +return dynamic_dname (buffer, buflen,"%s:[%lu]" , ns_ops->name, inode->i_ino); }
fs/pipe.c +1 -1
@@ -860,7 +860,7 @@ static struct vfsmount *pipe_mnt __read_mostly;*/ static char *pipefs_dname (struct dentry *dentry,char *buffer,int buflen) { -return dynamic_dname (dentry, buffer, buflen,"pipe:[%lu]" , +return dynamic_dname (buffer, buflen,"pipe:[%lu]" ,d_inode (dentry)->i_ino); }
include/linux/dcache.h +2 -2
@@ -287,8 +287,8 @@ static inline unsigned d_count(const struct dentry *dentry)/* * helper function for dentry_operations.d_dname() members */ -extern __printf(4, 5) -char *dynamic_dname(struct dentry *, char *, int, const char *, ...); +extern __printf(3, 4) +char *dynamic_dname(char *, int, const char *, ...); extern char *__d_path(const struct path *, const struct path *, char *, int); extern char *d_absolute_path(const struct path *, char *, int);
net/socket.c +1 -1
@@ -355,7 +355,7 @@ static const struct super_operations sockfs_ops = {*/ static char *sockfs_dname (struct dentry *dentry,char *buffer,int buflen) { -return dynamic_dname (dentry, buffer, buflen,"socket:[%lu]" , +return dynamic_dname (buffer, buflen,"socket:[%lu]" ,d_inode (dentry)->i_ino); }
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 2/5 ksmbd: don't open-code file_path()
--- fs/ksmbd/smb2pdu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ksmbd/smb2pdu.c +2 -2
@@ -5416,7 +5416,7 @@ static int smb2_rename(struct ksmbd_work *work,if (!pathname)return -ENOMEM ; - abs_oldname =d_path (&fp->filp->f_path, pathname,PATH_MAX ); + abs_oldname =file_path (fp->filp, pathname,PATH_MAX );if (IS_ERR (abs_oldname)) { rc = -EINVAL ; goto out;
@@ -5551,7 +5551,7 @@ static int smb2_create_link(struct ksmbd_work *work, }ksmbd_debug (SMB ,"link name is %s\n" , link_name); - target_name =d_path (&filp->f_path, pathname,PATH_MAX ); + target_name =file_path (filp, pathname,PATH_MAX );if (IS_ERR (target_name)) { rc = -EINVAL ; goto out;
Signature · 1 line
2.30.2
Re: [PATCH 2/5] ksmbd: don't open-code file_path()
2022-08-18 11:58 GMT+09:00, Al Viro <[email protected]>:
Quoted 1 line
Signed-off-by Al Viro <[email protected]>
Thanks!
Quoted 30 lines
--- fs/ksmbd/smb2pdu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/ksmbd/smb2pdu.c +2
-3@@ -5416,7 +5416,7 @@ static int smb2_rename(struct ksmbd_work *work,if (!pathname)return -ENOMEM ; - abs_oldname =d_path (&fp->filp->f_path, pathname,PATH_MAX ); + abs_oldname =file_path (fp->filp, pathname,PATH_MAX );if (IS_ERR (abs_oldname)) { rc = -EINVAL ; goto out;@@ -5551,7 +5551,7 @@ static int smb2_create_link(struct ksmbd_work *work, }ksmbd_debug (SMB ,"link name is %s\n" , link_name); - target_name =d_path (&filp->f_path, pathname,PATH_MAX ); + target_name =file_path (filp, pathname,PATH_MAX );if (IS_ERR (target_name)) { rc = -EINVAL ; goto out; --2.30.2
Al Viro
maintainerPATCH 3/5 ->getprocattr(): attribute name is const char *, TYVM...
In reply to Al Virocast of ->d_name.name to char * is completely wrong - nothing is allowed to modify its contents.
--- fs/proc/base.c | 2 +- include/linux/lsm_hook_defs.h | 2 +- include/linux/security.h | 4 ++-- security/apparmor/lsm.c | 2 +- security/security.c | 4 ++-- security/selinux/hooks.c | 2 +- security/smack/smack_lsm.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-)
fs/proc/base.c +1 -1
@@ -2728,7 +2728,7 @@ static ssize_t proc_pid_attr_read(struct file * file, char __user * buf,return -ESRCH ; length =security_getprocattr (task,PROC_I (inode)->op.lsm, - (char *)file->f_path.dentry->d_name.name, + file->f_path.dentry->d_name.name, &p);put_task_struct (task);if (length >0 )
include/linux/lsm_hook_defs.h +1 -1
@@ -253,7 +253,7 @@ LSM_HOOK(int, 0, sem_semop, struct kern_ipc_perm *perm, struct sembuf *sops, LSM_HOOK(int, 0, netlink_send, struct sock *sk, struct sk_buff *skb) LSM_HOOK(void, LSM_RET_VOID, d_instantiate, struct dentry *dentry, struct inode *inode) -LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct *p, char *name, +LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct *p, const char *name, char **value) LSM_HOOK(int, -EINVAL, setprocattr, const char *name, void *value, size_t size) LSM_HOOK(int, 0, ismaclabel, const char *name)
include/linux/security.h +2 -2
@@ -461,7 +461,7 @@ int security_sem_semctl(struct kern_ipc_perm *sma, int cmd);int security_sem_semop (struct kern_ipc_perm *sma,struct sembuf *sops,unsigned nsops,int alter);void security_d_instantiate (struct dentry *dentry,struct inode *inode); -int security_getprocattr (struct task_struct *p,const char *lsm,char *name, +int security_getprocattr (struct task_struct *p,const char *lsm,const char *name,char **value);int security_setprocattr (const char *lsm,const char *name,void *value,size_t size);
@@ -1301,7 +1301,7 @@ static inline void security_d_instantiate(struct dentry *dentry, { }static inline int security_getprocattr (struct task_struct *p,const char *lsm, -char *name,char **value) +const char *name,char **value) {return -EINVAL ; }
security/apparmor/lsm.c +1 -1
@@ -614,7 +614,7 @@ static int apparmor_sb_pivotroot(const struct path *old_path,return error; } -static int apparmor_getprocattr (struct task_struct *task,char *name, +static int apparmor_getprocattr (struct task_struct *task,const char *name,char **value) {int error = -ENOENT ;
security/security.c +2 -2
@@ -2057,8 +2057,8 @@ void security_d_instantiate(struct dentry *dentry, struct inode *inode) }EXPORT_SYMBOL (security_d_instantiate); -int security_getprocattr (struct task_struct *p,const char *lsm,char *name, -char **value) +int security_getprocattr (struct task_struct *p,const char *lsm, +const char *name,char **value) {struct security_hook_list *hp;
security/selinux/hooks.c +1 -1
@@ -6327,7 +6327,7 @@ static void selinux_d_instantiate(struct dentry *dentry, struct inode *inode) }static int selinux_getprocattr (struct task_struct *p, -char *name,char **value) +const char *name,char **value) {const struct task_security_struct *__tsec;u32 sid;
security/smack/smack_lsm.c +1 -1
@@ -3479,7 +3479,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)* * Returns the length of the smack label or an error code */ -static int smack_getprocattr (struct task_struct *p,char *name,char **value) +static int smack_getprocattr (struct task_struct *p,const char *name,char **value) {struct smack_known *skp =smk_of_task_struct_obj (p);char *cp;
Signature · 1 line
2.30.2
RE: [PATCH 3/5] ->getprocattr(): attribute name is const char *, TYVM...
Quoted 11 lines
-----Original Message-----
From: Al Viro <[email protected]> On Behalf Of Al Viro
Sent: Wednesday, August 17, 2022 7:59 PM
To: [email protected]
Cc: [email protected]
Subject: [PATCH 3/5] ->getprocattr(): attribute name is const char *, TYVM...cast of ->d_name.name to char * is completely wrong - nothing is allowed to modify its contents.
Signed-off-by Al Viro <[email protected]>
Could we please have the LSM list included when making changes in the security sub-system?
Thank you.
Quoted 128 lines
--- fs/proc/base.c | 2 +- include/linux/lsm_hook_defs.h | 2 +- include/linux/security.h | 4 ++-- security/apparmor/lsm.c | 2 +- security/security.c | 4 ++-- security/selinux/hooks.c | 2 +- security/smack/smack_lsm.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-)fs/proc/base.c +1
-1@@ -2728,7 +2728,7 @@ static ssize_t proc_pid_attr_read(struct file * file,char __user * buf, return -ESRCH; length =security_getprocattr (task,PROC_I (inode)->op.lsm, - (char *)file->f_path.dentry- >d_name.name, + file->f_path.dentry->d_name.name, &p);fs/proc/base.c +0
-0put_task_struct (task);if (length >0 )include/linux/lsm_hook_defs.h +1
-1@@ -253,7 +253,7 @@ LSM_HOOK(int, 0, sem_semop, struct kern_ipc_perm *perm, struct sembuf *sops, LSM_HOOK(int, 0, netlink_send, struct sock *sk, struct sk_buff *skb) LSM_HOOK(void, LSM_RET_VOID, d_instantiate, struct dentry *dentry, struct inode *inode) -LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct *p, char *name, +LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct *p, const char *name, char **value)LSM_HOOK(int,
-EINVAL, setprocattr, const char *name, void *value,size_t
size)
LSM_HOOK(int, 0, ismaclabel, const char *name)include/linux/security.h +1
-1@@ -461,7 +461,7 @@ int security_sem_semctl(struct kern_ipc_perm *sma, int cmd);int security_sem_semop (struct kern_ipc_perm *sma,struct sembuf *sops,unsigned nsops,int alter);void security_d_instantiate (struct dentry *dentry,struct inode *inode); -int security_getprocattr (struct task_struct *p,const char *lsm,char *name, +int security_getprocattr (struct task_struct *p,const char *lsm,const char *name,char **value);int security_setprocattr(const char *lsm, const char *name, void *value,
include/linux/security.h +1
-1size_t size);@@ -1301,7 +1301,7 @@ static inline void security_d_instantiate(struct dentry *dentry, { }static inline int security_getprocattr (struct task_struct *p,const char *lsm, -char *name,char **value) +const char *name,char **value) {return -EINVAL ;}
security/apparmor/lsm.c +1
-1@@ -614,7 +614,7 @@ static int apparmor_sb_pivotroot(const struct path *old_path, return error; } -static int apparmor_getprocattr (struct task_struct *task,char *name, +static int apparmor_getprocattr (struct task_struct *task,const char *name,char **value) {security/apparmor/lsm.c +0
-0int error = -ENOENT ;security/security.c +2
-2@@ -2057,8 +2057,8 @@ void security_d_instantiate(struct dentry *dentry, struct inode *inode) }EXPORT_SYMBOL (security_d_instantiate); -int security_getprocattr (struct task_struct *p,const char *lsm,char *name, -char **value) +int security_getprocattr (struct task_struct *p,const char *lsm, +const char *name,char **value) {struct security_hook_list *hp;security/selinux/hooks.c +1
-1@@ -6327,7 +6327,7 @@ static void selinux_d_instantiate(struct dentry *dentry, struct inode *inode) }static int selinux_getprocattr (struct task_struct *p, -char *name,char **value) +const char *name,char **value) {const struct task_security_struct *__tsec;security/selinux/hooks.c +0
-0u32 sid;security/smack/smack_lsm.c +1
-1@@ -3479,7 +3479,7 @@ static void smack_d_instantiate(struct dentry*opt_dentry, struct inode *inode) * * Returns the length of the smack label or an error code */ -static int smack_getprocattr (struct task_struct *p,char *name,char **value) +static int smack_getprocattr (struct task_struct *p,const char *name,char **value){
security/smack/smack_lsm.c +0
-1struct smack_known *skp =smk_of_task_struct_obj (p);char *cp; --2.30.2
Re: [PATCH 3/5] ->getprocattr(): attribute name is const char *, TYVM...
In reply to Al ViroQuoted 5 lines · Al Viro
cast of ->d_name.name to char * is completely wrong - nothing is allowed to modify its contents.
Signed-off-by Al Viro <[email protected]>---
Al Viro
maintainerPATCH 4/5 ksmbd: don't open-code %pf
In reply to Al Viro--- fs/ksmbd/vfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ksmbd/vfs.c +2 -2
@@ -1743,11 +1743,11 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work, *total_size_written =0 ;if (!(src_fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , src_fp->filp->f_path.dentry); +pr_err ("no right to read(%pf)\n" , src_fp->filp);return -EACCES ; }if (!(dst_fp->daccess & (FILE_WRITE_DATA_LE |FILE_APPEND_DATA_LE ))) { -pr_err ("no right to write(%pd)\n" , dst_fp->filp->f_path.dentry); +pr_err ("no right to write(%pf)\n" , dst_fp->filp);return -EACCES ; }
Signature · 1 line
2.30.2
Namjae Jeon
maintainerRe: [PATCH 4/5] ksmbd: don't open-code %pf
2022-08-18 11:59 GMT+09:00, Al Viro <[email protected]>:
Quoted 10 lines
Signed-off-by Al Viro <[email protected]>--- fs/ksmbd/vfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/ksmbd/vfs.c +0
-0
fs/ksmbd/vfs.c int ksmbd_vfs_copy_file_ranges(struct ksmbd_work · line 1747
Quoted 6 lines
fs/ksmbd/vfs.c +1
-1@@ -1743,11 +1743,11 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work, *total_size_written =0 ;if (!(src_fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , src_fp->filp->f_path.dentry); +pr_err ("no right to read(%pf)\n" , src_fp->filp);
Isn't this probably %pD?
Thanks.
Quoted 12 lines
fs/ksmbd/vfs.c +1
-2return -EACCES ; }if (!(dst_fp->daccess & (FILE_WRITE_DATA_LE |FILE_APPEND_DATA_LE ))) { -pr_err ("no right to write(%pd)\n" , dst_fp->filp->f_path.dentry); +pr_err ("no right to write(%pf)\n" , dst_fp->filp);return -EACCES ; } --2.30.2
Al Viro
maintainerRe: [PATCH 4/5] ksmbd: don't open-code %pf
Quoted 14 lines · Namjae Jeon
2022-08-18 11:59 GMT+09:00, Al Viro <[email protected]>:
Quoted 13 lines
Signed-off-by Al Viro <[email protected]>--- fs/ksmbd/vfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/ksmbd/vfs.c +0
-0@@ -1743,11 +1743,11 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work, *total_size_written =0 ;
Quoted 4 lines
fs/ksmbd/vfs.c int ksmbd_vfs_copy_file_ranges(struct ksmbd_work · line 1747
Quoted 3 lines
fs/ksmbd/vfs.c +1
-1if (!(src_fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , src_fp->filp->f_path.dentry); +pr_err ("no right to read(%pf)\n" , src_fp->filp);Isn't this probably %pD?
*blink*
It certainly is; thanks for catching that braino... While we are at it, there's several more places of the same form these days, so fixed and updated variant follows:
ksmbd: don't open-code %pD
a bunch of places used %pd with file->f_path.dentry; shorter (and saner) way to spell that is %pD with file...
---
fs/ksmbd/smb2pdu.c +5 -6
@@ -3897,8 +3897,7 @@ int smb2_query_dir(struct ksmbd_work *work) inode_permission(file_mnt_user_ns(dir_fp->filp), file_inode(dir_fp->filp), MAY_READ | MAY_EXEC)) { -pr_err ("no right to enumerate directory (%pd)\n" , - dir_fp->filp->f_path.dentry); +pr_err ("no right to enumerate directory (%pD)\n" , dir_fp->filp); rc = -EACCES ; goto err_out2; }
@@ -6269,8 +6268,8 @@ int smb2_read(struct ksmbd_work *work) goto out; } -ksmbd_debug (SMB ,"filename %pd, offset %lld, len %zu\n" , - fp->filp->f_path.dentry, offset, length); +ksmbd_debug (SMB ,"filename %pD, offset %lld, len %zu\n" , + fp->filp, offset, length); work->aux_payload_buf =kvmalloc (length,GFP_KERNEL | __GFP_ZERO);if (!work->aux_payload_buf) {
@@ -6534,8 +6533,8 @@ int smb2_write(struct ksmbd_work *work) data_buf = (char *)(((char *)&req->hdr.ProtocolId) +le16_to_cpu (req->DataOffset)); -ksmbd_debug (SMB ,"filename %pd, offset %lld, len %zu\n" , - fp->filp->f_path.dentry, offset, length); +ksmbd_debug (SMB ,"filename %pD, offset %lld, len %zu\n" , + fp->filp, offset, length); err =ksmbd_vfs_write (work, fp, data_buf, length, &offset, writethrough, &nbytes);if (err <0 )
fs/ksmbd/vfs.c +6 -8
@@ -377,8 +377,7 @@ int ksmbd_vfs_read(struct ksmbd_work *work, struct ksmbd_file *fp, size_t count,if (work->conn->connection_type) {if (!(fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , - fp->filp->f_path.dentry); +pr_err ("no right to read(%pD)\n" , fp->filp);return -EACCES ; } }
@@ -487,8 +486,7 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp,if (work->conn->connection_type) {if (!(fp->daccess &FILE_WRITE_DATA_LE )) { -pr_err ("no right to write(%pd)\n" , - fp->filp->f_path.dentry); +pr_err ("no right to write(%pD)\n" , fp->filp); err = -EACCES ; goto out; }
@@ -527,8 +525,8 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp,if (sync) { err =vfs_fsync_range (filp, offset, offset + *written,0 );if (err <0 ) -pr_err ("fsync failed for filename = %pd, err = %d\n" , - fp->filp->f_path.dentry, err); +pr_err ("fsync failed for filename = %pD, err = %d\n" , + fp->filp, err); } out:
@@ -1743,11 +1741,11 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work, *total_size_written =0 ;if (!(src_fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , src_fp->filp->f_path.dentry); +pr_err ("no right to read(%pD)\n" , src_fp->filp);return -EACCES ; }if (!(dst_fp->daccess & (FILE_WRITE_DATA_LE |FILE_APPEND_DATA_LE ))) { -pr_err ("no right to write(%pd)\n" , dst_fp->filp->f_path.dentry); +pr_err ("no right to write(%pD)\n" , dst_fp->filp);return -EACCES ; }
Re: [PATCH 4/5] ksmbd: don't open-code %pf
2022-08-19 5:35 GMT+09:00, Al Viro <[email protected]>:
Quoted 21 lines · Namjae Jeon
Quoted 15 lines
2022-08-18 11:59 GMT+09:00, Al Viro <[email protected]>:
Quoted 14 lines
Signed-off-by Al Viro <[email protected]>--- fs/ksmbd/vfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/ksmbd/vfs.c +0
-0@@ -1743,11 +1743,11 @@ int ksmbd_vfs_copy_file_ranges(struct
ksmbd_work
*work,
*total_size_written= 0;Quoted 4 lines
fs/ksmbd/vfs.c int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work,
Quoted 3 lines
fs/ksmbd/vfs.c +1
-1if (!(src_fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , src_fp->filp->f_path.dentry); +pr_err ("no right to read(%pf)\n" , src_fp->filp);Isn't this probably %pD?
Quoted 5 lines
*blink*
It certainly is; thanks for catching that braino... While we are at it, there's several more places of the same form these days, so fixed and updated variant follows:
Thanks for updating the patch!
Quoted 7 lines
ksmbd: don't open-code %pD
a bunch of places used %pd with
file->f_path.dentry; shorter (and saner) way to spell that is %pD with file...Signed-off-by Al Viro <[email protected]>
Thanks!
Quoted 92 lines
---
fs/ksmbd/smb2pdu.c +5
-6@@ -3897,8 +3897,7 @@ int smb2_query_dir(struct ksmbd_work *work) inode_permission(file_mnt_user_ns(dir_fp->filp), file_inode(dir_fp->filp), MAY_READ | MAY_EXEC)) { -pr_err ("no right to enumerate directory (%pd)\n" , - dir_fp->filp->f_path.dentry); +pr_err ("no right to enumerate directory (%pD)\n" , dir_fp->filp); rc = -EACCES ; goto err_out2; }@@ -6269,8 +6268,8 @@ int smb2_read(struct ksmbd_work *work) goto out; } -ksmbd_debug (SMB ,"filename %pd, offset %lld, len %zu\n" , - fp->filp->f_path.dentry, offset, length); +ksmbd_debug (SMB ,"filename %pD, offset %lld, len %zu\n" , + fp->filp, offset, length); work->aux_payload_buf =kvmalloc (length,GFP_KERNEL | __GFP_ZERO);if (!work->aux_payload_buf) {@@ -6534,8 +6533,8 @@ int smb2_write(struct ksmbd_work *work) data_buf = (char *)(((char *)&req->hdr.ProtocolId) +le16_to_cpu (req->DataOffset)); -ksmbd_debug (SMB ,"filename %pd, offset %lld, len %zu\n" , - fp->filp->f_path.dentry, offset, length); +ksmbd_debug (SMB ,"filename %pD, offset %lld, len %zu\n" , + fp->filp, offset, length); err =ksmbd_vfs_write (work, fp, data_buf, length, &offset, writethrough, &nbytes);if (err <0 )fs/ksmbd/vfs.c +1
-2@@ -377,8 +377,7 @@ int ksmbd_vfs_read(struct ksmbd_work *work, struct ksmbd_file *fp, size_t count, if (work->conn->connection_type) { if (!(fp->daccess & (FILE_READ_DATA_LE | FILE_EXECUTE_LE))) { - pr_err("no right to read(%pd)\n", - fp->filp->f_path.dentry); + pr_err("no right to read(%pD)\n", fp->filp);return -EACCES ; }fs/ksmbd/vfs.c +1
-2}@@ -487,8 +486,7 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp, if (work->conn->connection_type) {if (!(fp->daccess &FILE_WRITE_DATA_LE )) { -pr_err ("no right to write(%pd)\n" , - fp->filp->f_path.dentry); +pr_err ("no right to write(%pD)\n" , fp->filp); err = -EACCES ; goto out;fs/ksmbd/vfs.c +2
-2}@@ -527,8 +525,8 @@ int ksmbd_vfs_write(struct ksmbd_work *work, structksmbd_file *fp, if (sync) { err =vfs_fsync_range (filp, offset, offset + *written,0 );if (err <0 ) -pr_err ("fsync failed for filename = %pd, err = %d\n" , - fp->filp->f_path.dentry, err); +pr_err ("fsync failed for filename = %pD, err = %d\n" , + fp->filp, err); }out:
fs/ksmbd/vfs.c +2
-2@@ -1743,11 +1741,11 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work, *total_size_written =0 ;if (!(src_fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , src_fp->filp->f_path.dentry); +pr_err ("no right to read(%pD)\n" , src_fp->filp);return -EACCES ; }if (!(dst_fp->daccess & (FILE_WRITE_DATA_LE |FILE_APPEND_DATA_LE ))) { -pr_err ("no right to write(%pd)\n" , dst_fp->filp->f_path.dentry); +pr_err ("no right to write(%pD)\n" , dst_fp->filp);return -EACCES ; }
Al Viro
maintainerRe: [PATCH 4/5] ksmbd: don't open-code %pf
Quoted 22 lines · Namjae Jeon
2022-08-19 5:35 GMT+09:00, Al Viro <[email protected]>:
Quoted 21 lines · Namjae Jeon
Quoted 19 lines
2022-08-18 11:59 GMT+09:00, Al Viro <[email protected]>:
Quoted 12 lines
Signed-off-by Al Viro <[email protected]>--- fs/ksmbd/vfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/ksmbd/vfs.c +0
-0@@ -1743,11 +1743,11 @@ int ksmbd_vfs_copy_file_ranges(struct
ksmbd_work
*work,fs/ksmbd/vfs.c
Quoted 5 lines
fs/ksmbd/vfs.c +1
-1*total_size_written =0 ;if (!(src_fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , src_fp->filp->f_path.dentry); +pr_err ("no right to read(%pf)\n" , src_fp->filp);Isn't this probably %pD?
Quoted 6 lines
Quoted 5 lines
*blink*
It certainly is; thanks for catching that braino... While we are at it, there's several more places of the same form these days, so fixed and updated variant follows:
Thanks for updating the patch!
OK... FWIW, I've another ksmbd patch hanging around and it might be less PITA if I put it + those two patches into never-rebased branch (for-ksmbd) for ksmbd folks to pull from. Fewer pointless conflicts that way... The third patch is below:
ksmbd: constify struct path
... in particular, there should never be a non-const pointers to any file->f_path.
---
fs/ksmbd/misc.c +1 -1
@@ -159,7 +159,7 @@ int parse_stream_name(char *filename, char **stream_name, int *s_type)*/ char *convert_to_nt_pathname (struct ksmbd_share_config *share, -struct path *path) +const struct path *path) {char *pathname, *ab_pathname, *nt_pathname;int share_path_len = share->path_sz;
fs/ksmbd/misc.h +1 -1
@@ -15,7 +15,7 @@ int match_pattern(const char *str, size_t len, const char *pattern);int ksmbd_validate_filename (char *filename);int parse_stream_name (char *filename,char **stream_name,int *s_type);char *convert_to_nt_pathname (struct ksmbd_share_config *share, -struct path *path); +const struct path *path);int get_nlink (struct kstat *st);void ksmbd_conv_path_to_unix (char *path);void ksmbd_strip_last_slash (char *path);
fs/ksmbd/smb2pdu.c +9 -9
@@ -2183,7 +2183,7 @@ static noinline int create_smb2_pipe(struct ksmbd_work *work)* Return: 0 on success, otherwise error */ static int smb2_set_ea (struct smb2_ea_info *eabuf,unsigned int buf_len, -struct path *path) +const struct path *path) {struct user_namespace *user_ns =mnt_user_ns (path->mnt);char *attr_name =NULL , *value;
@@ -2270,7 +2270,7 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len,return rc; } -static noinline int smb2_set_stream_name_xattr(struct path *path, +static noinline int smb2_set_stream_name_xattr(const struct path *path,struct ksmbd_file *fp,char *stream_name,int s_type) {
@@ -2309,7 +2309,7 @@ static noinline int smb2_set_stream_name_xattr(struct path *path,return 0 ; } -static int smb2_remove_smb_xattrs (struct path *path) +static int smb2_remove_smb_xattrs (const struct path *path) {struct user_namespace *user_ns =mnt_user_ns (path->mnt);char *name, *xattr_list =NULL ;
@@ -2343,7 +2343,7 @@ static int smb2_remove_smb_xattrs(struct path *path)return err; } -static int smb2_create_truncate (struct path *path) +static int smb2_create_truncate (const struct path *path) {int rc =vfs_truncate (path,0 );
@@ -2362,7 +2362,7 @@ static int smb2_create_truncate(struct path *path)return rc; } -static void smb2_new_xattrs (struct ksmbd_tree_connect *tcon,struct path *path, +static void smb2_new_xattrs (struct ksmbd_tree_connect *tcon,const struct path *path,struct ksmbd_file *fp) {struct xattr_dos_attrib da = {0 };
@@ -2385,7 +2385,7 @@ static void smb2_new_xattrs(struct ksmbd_tree_connect *tcon, struct path *path, }static void smb2_update_xattrs (struct ksmbd_tree_connect *tcon, -struct path *path,struct ksmbd_file *fp) +const struct path *path,struct ksmbd_file *fp) {struct xattr_dos_attrib da;int rc;
@@ -2445,7 +2445,7 @@ static int smb2_creat(struct ksmbd_work *work, struct path *path, char *name,static int smb2_create_sd_buffer (struct ksmbd_work *work,struct smb2_create_req *req, -struct path *path) +const struct path *path) {struct create_context *context;struct create_sd_buf_req *sd_buf;
@@ -4160,7 +4160,7 @@ static int smb2_get_ea(struct ksmbd_work *work, struct ksmbd_file *fp,int rc, name_len, value_len, xattr_list_len, idx;ssize_t buf_free_len, alignment_bytes, next_offset, rsp_data_cnt =0 ;struct smb2_ea_info_req *ea_req =NULL ; -struct path *path; +const struct path *path;struct user_namespace *user_ns =file_mnt_user_ns (fp->filp);if (!(fp->daccess &FILE_READ_EA_LE )) {
@@ -4497,7 +4497,7 @@ static void get_file_stream_info(struct ksmbd_work *work,struct smb2_file_stream_info *file_info;char *stream_name, *xattr_list =NULL , *stream_buf;struct kstat stat; -struct path *path = &fp->filp->f_path; +const struct path *path = &fp->filp->f_path;ssize_t xattr_list_len;int nbytes =0 , streamlen, stream_name_len, next, idx =0 ;int buf_free_len;
fs/ksmbd/smbacl.c +3 -3
@@ -991,7 +991,7 @@ static void smb_set_ace(struct smb_ace *ace, const struct smb_sid *sid, u8 type, }int smb_inherit_dacl (struct ksmbd_conn *conn, -struct path *path, +const struct path *path,unsigned int uid,unsigned int gid) {const struct smb_sid *psid, *creator =NULL ;
@@ -1185,7 +1185,7 @@ bool smb_inherit_flags(int flags, bool is_dir)return false; } -int smb_check_perm_dacl (struct ksmbd_conn *conn,struct path *path, +int smb_check_perm_dacl (struct ksmbd_conn *conn,const struct path *path,__le32 *pdaccess,int uid) {struct user_namespace *user_ns =mnt_user_ns (path->mnt);
@@ -1352,7 +1352,7 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, struct path *path, }int set_info_sec (struct ksmbd_conn *conn,struct ksmbd_tree_connect *tcon, -struct path *path,struct smb_ntsd *pntsd,int ntsd_len, +const struct path *path,struct smb_ntsd *pntsd,int ntsd_len,bool type_check) {int rc;
fs/ksmbd/smbacl.h +3 -3
@@ -201,12 +201,12 @@ void posix_state_to_acl(struct posix_acl_state *state, struct posix_acl_entry *pace);int compare_sids (const struct smb_sid *ctsid,const struct smb_sid *cwsid);bool smb_inherit_flags (int flags,bool is_dir); -int smb_inherit_dacl (struct ksmbd_conn *conn,struct path *path, +int smb_inherit_dacl (struct ksmbd_conn *conn,const struct path *path,unsigned int uid,unsigned int gid); -int smb_check_perm_dacl (struct ksmbd_conn *conn,struct path *path, +int smb_check_perm_dacl (struct ksmbd_conn *conn,const struct path *path,__le32 *pdaccess,int uid);int set_info_sec (struct ksmbd_conn *conn,struct ksmbd_tree_connect *tcon, -struct path *path,struct smb_ntsd *pntsd,int ntsd_len, +const struct path *path,struct smb_ntsd *pntsd,int ntsd_len,bool type_check);void id_to_sid (unsigned int cid,uint sidtype,struct smb_sid *ssid);void ksmbd_init_domain (u32 *sub_auth);
fs/ksmbd/vfs.c +2 -2
@@ -541,7 +541,7 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp,* * Return: 0 on success, otherwise error */ -int ksmbd_vfs_getattr (struct path *path,struct kstat *stat) +int ksmbd_vfs_getattr (const struct path *path,struct kstat *stat) {int err;
@@ -1166,7 +1166,7 @@ static int __caseless_lookup(struct dir_context *ctx, const char *name,* * Return: 0 on success, otherwise error */ -static int ksmbd_vfs_lookup_in_dir (struct path *dir,char *name,size_t namelen) +static int ksmbd_vfs_lookup_in_dir (const struct path *dir,char *name,size_t namelen) {int ret;struct file *dfilp;
fs/ksmbd/vfs.h +1 -1
@@ -85,7 +85,7 @@ int ksmbd_vfs_fsync(struct ksmbd_work *work, u64 fid, u64 p_id);int ksmbd_vfs_remove_file (struct ksmbd_work *work,char *name);int ksmbd_vfs_link (struct ksmbd_work *work,const char *oldname,const char *newname); -int ksmbd_vfs_getattr (struct path *path,struct kstat *stat); +int ksmbd_vfs_getattr (const struct path *path,struct kstat *stat);int ksmbd_vfs_fp_rename (struct ksmbd_work *work,struct ksmbd_file *fp,char *newname); int ksmbd_vfs_truncate(struct ksmbd_work *work,
Re: [PATCH 4/5] ksmbd: don't open-code %pf
2022-08-20 12:47 GMT+09:00, Al Viro <[email protected]>:
Quoted 29 lines · Namjae Jeon
Quoted 28 lines
2022-08-19 5:35 GMT+09:00, Al Viro <[email protected]>:
Quoted 27 lines · Namjae Jeon
Quoted 15 lines
2022-08-18 11:59 GMT+09:00, Al Viro <[email protected]>:
Quoted 14 lines
Signed-off-by Al Viro <[email protected]>--- fs/ksmbd/vfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/ksmbd/vfs.c +0
-0@@ -1743,11 +1743,11 @@ int ksmbd_vfs_copy_file_ranges(struct
ksmbd_work
*work,
*total_size_written= 0;Quoted 4 lines
fs/ksmbd/vfs.c
Quoted 3 lines
fs/ksmbd/vfs.c +1
-1if (!(src_fp->daccess & (FILE_READ_DATA_LE |FILE_EXECUTE_LE ))) { -pr_err ("no right to read(%pd)\n" , src_fp->filp->f_path.dentry); +pr_err ("no right to read(%pf)\n" , src_fp->filp);Isn't this probably %pD?
*blink*
It certainly is; thanks for catching that braino... While we are at it,
there's several more places of the same form these days, so fixed and updated variant follows:
Quoted 6 lines
Quoted 1 line
Thanks for updating the patch!
OK... FWIW, I've another ksmbd patch hanging around and it might be less PITA if I put it + those two patches into never-rebased branch (for-ksmbd) for ksmbd folks to pull from. Fewer pointless conflicts that way...
Okay, Thanks for this. I'm trying to resend "ksmbd: fix racy issue from using ->d_parent and ->d_name" patch to you, but It conflict with these patches:)
We will pull them from that branch if you create it.
Quoted 8 lines
The third patch is below:
ksmbd: constify struct path
... in particular, there should never be a non-const pointers to any
file->f_path.Signed-off-by Al Viro <[email protected]>
Looks good to me!
Thanks!
Quoted 220 lines
---
fs/ksmbd/misc.c +1
-1@@ -159,7 +159,7 @@ int parse_stream_name(char *filename, char**stream_name, int *s_type) */ char *convert_to_nt_pathname (struct ksmbd_share_config *share, -struct path *path) +const struct path *path) {char *pathname, *ab_pathname, *nt_pathname;fs/ksmbd/misc.c +0
-0int share_path_len = share->path_sz;fs/ksmbd/misc.h +1
-1@@ -15,7 +15,7 @@ int match_pattern(const char *str, size_t len, const char *pattern);int ksmbd_validate_filename (char *filename);int parse_stream_name (char *filename,char **stream_name,int *s_type);char *convert_to_nt_pathname (struct ksmbd_share_config *share, -struct path *path); +const struct path *path);int get_nlink (struct kstat *st);void ksmbd_conv_path_to_unix (char *path);void
ksmbd_strip_last_slash(char *path);fs/ksmbd/smb2pdu.c +1
-1@@ -2183,7 +2183,7 @@ static noinline int create_smb2_pipe(struct ksmbd_work*work) * Return: 0 on success, otherwise error */ static int smb2_set_ea (struct smb2_ea_info *eabuf,unsigned int buf_len, -struct path *path) +const struct path *path) {struct user_namespace *user_ns =mnt_user_ns (path->mnt);fs/ksmbd/smb2pdu.c +1
-1char *attr_name =NULL , *value;@@ -2270,7 +2270,7 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf,unsigned int buf_len, return rc; } -static noinline int smb2_set_stream_name_xattr(struct path *path, +static noinline int smb2_set_stream_name_xattr(const struct path *path,struct ksmbd_file *fp,char *stream_name,int s_type){
fs/ksmbd/smb2pdu.c +1
-1@@ -2309,7 +2309,7 @@ static noinline int smb2_set_stream_name_xattr(structpath *path, return 0; } -static int smb2_remove_smb_xattrs (struct path *path) +static int smb2_remove_smb_xattrs (const struct path *path) {struct user_namespace *user_ns =mnt_user_ns (path->mnt);fs/ksmbd/smb2pdu.c +2
-2char *name, *xattr_list =NULL ;@@ -2343,7 +2343,7 @@ static int smb2_remove_smb_xattrs(struct path *path)return err; } -static int smb2_create_truncate (struct path *path) +static int smb2_create_truncate (const struct path *path) {int rc =vfs_truncate (path,0 );@@ -2362,7 +2362,7 @@ static int smb2_create_truncate(struct path *path)return rc; } -static void smb2_new_xattrs (struct ksmbd_tree_connect *tcon,struct path *path, +static void smb2_new_xattrs(struct ksmbd_tree_connect *tcon, const structpath *path,struct ksmbd_file *fp){
fs/ksmbd/smb2pdu.c +1
-1struct xattr_dos_attrib da = {0 };@@ -2385,7 +2385,7 @@ static void smb2_new_xattrs(struct ksmbd_tree_connect *tcon, struct path *path, }static void smb2_update_xattrs (struct ksmbd_tree_connect *tcon, -struct path *path,struct ksmbd_file *fp) +const struct path *path,struct ksmbd_file *fp) {struct xattr_dos_attrib da;fs/ksmbd/smb2pdu.c +1
-1int rc;@@ -2445,7 +2445,7 @@ static int smb2_creat(struct ksmbd_work *work, struct path *path, char *name, static int smb2_create_sd_buffer(struct ksmbd_work *work,struct smb2_create_req *req, -struct path *path) +const struct path *path) {struct create_context *context;fs/ksmbd/smb2pdu.c +1
-1struct create_sd_buf_req *sd_buf;@@ -4160,7 +4160,7 @@ static int smb2_get_ea(struct ksmbd_work *work, structksmbd_file *fp, int rc, name_len, value_len, xattr_list_len, idx;ssize_t buf_free_len, alignment_bytes, next_offset, rsp_data_cnt =0 ;struct smb2_ea_info_req *ea_req =NULL ; -struct path *path; +const struct path *path;struct user_namespace *user_ns =file_mnt_user_ns (fp->filp);fs/ksmbd/smb2pdu.c +1
-1if (!(fp->daccess &FILE_READ_EA_LE )) {@@ -4497,7 +4497,7 @@ static void get_file_stream_info(struct ksmbd_work *work, struct smb2_file_stream_info *file_info;char *stream_name, *xattr_list =NULL , *stream_buf;struct kstat stat; -struct path *path = &fp->filp->f_path; +const struct path *path = &fp->filp->f_path;ssize_t xattr_list_len;int nbytes =0 , streamlen, stream_name_len, next, idx =0 ;fs/ksmbd/smb2pdu.c +0
-0int buf_free_len;fs/ksmbd/smbacl.c +1
-1@@ -991,7 +991,7 @@ static void smb_set_ace(struct smb_ace *ace, const struct smb_sid *sid, u8 type, } int smb_inherit_dacl(struct ksmbd_conn *conn, - struct path *path, + const struct path *path, unsigned int uid, unsigned int gid) {fs/ksmbd/smbacl.c +2
-2const struct smb_sid *psid, *creator =NULL ;@@ -1185,7 +1185,7 @@ bool smb_inherit_flags(int flags, bool is_dir)return false; } -int smb_check_perm_dacl (struct ksmbd_conn *conn,struct path *path, +int smb_check_perm_dacl (struct ksmbd_conn *conn,const struct path *path,__le32 *pdaccess,int uid) {struct user_namespace *user_ns =mnt_user_ns (path->mnt);@@ -1352,7 +1352,7 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, struct path *path, } int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon, - struct path *path, struct smb_ntsd *pntsd, int ntsd_len, + const struct path *path, struct smb_ntsd *pntsd, int ntsd_len, bool type_check) {fs/ksmbd/smbacl.c +0
-0int rc;fs/ksmbd/smbacl.h +3
-3@@ -201,12 +201,12 @@ void posix_state_to_acl(struct posix_acl_state *state, struct posix_acl_entry *pace);int compare_sids (const struct smb_sid *ctsid,const struct smb_sid *cwsid);bool smb_inherit_flags (int flags,bool is_dir); -int smb_inherit_dacl (struct ksmbd_conn *conn,struct path *path, +int smb_inherit_dacl (struct ksmbd_conn *conn,const struct path *path,unsigned int uid,unsigned int gid); -int smb_check_perm_dacl (struct ksmbd_conn *conn,struct path *path, +int smb_check_perm_dacl (struct ksmbd_conn *conn,const struct path *path,__le32 *pdaccess,int uid);int set_info_sec (struct ksmbd_conn *conn,struct ksmbd_tree_connect *tcon, -struct path *path,struct smb_ntsd *pntsd,int ntsd_len, +const struct path *path,struct smb_ntsd *pntsd,int ntsd_len,bool type_check);void
id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid); voidksmbd_init_domain(u32 *sub_auth);fs/ksmbd/vfs.c +2
-2@@ -541,7 +541,7 @@ int ksmbd_vfs_write(struct ksmbd_work *work, structksmbd_file *fp, * * Return: 0 on success, otherwise error */ -int ksmbd_vfs_getattr (struct path *path,struct kstat *stat) +int ksmbd_vfs_getattr (const struct path *path,struct kstat *stat) {int err;@@ -1166,7 +1166,7 @@ static int __caseless_lookup(struct dir_context *ctx,const char *name, * * Return: 0 on success, otherwise error */ -static int ksmbd_vfs_lookup_in_dir(struct path *dir, char *name, size_t namelen) +static int ksmbd_vfs_lookup_in_dir(const struct path *dir, char *name,size_t namelen){
fs/ksmbd/vfs.c +0
-0int ret;struct file *dfilp;fs/ksmbd/vfs.h +1
-1@@ -85,7 +85,7 @@ int ksmbd_vfs_fsync(struct ksmbd_work *work, u64 fid, u64 p_id);int ksmbd_vfs_remove_file (struct ksmbd_work *work,char *name);int ksmbd_vfs_link (struct ksmbd_work *work,const char *oldname,const char *newname); -int ksmbd_vfs_getattr (struct path *path,struct kstat *stat); +int ksmbd_vfs_getattr (const struct path *path,struct kstat *stat);int ksmbd_vfs_fp_rename (struct ksmbd_work *work,struct ksmbd_file *fp,char *newname);int ksmbd_vfs_truncate(struct
ksmbd_work*work,
Al Viro
maintainerRe: [PATCH 4/5] ksmbd: don't open-code %pf
Quoted 8 lines · Namjae Jeon
Quoted 4 lines
OK... FWIW, I've another ksmbd patch hanging around and it might be less PITA if I put it + those two patches into never-rebased branch (for-ksmbd) for ksmbd folks to pull from. Fewer pointless conflicts that way...
Okay, Thanks for this. I'm trying to resend "ksmbd: fix racy issue from using ->d_parent and ->d_name" patch to you, but It conflict with these patches:)
We will pull them from that branch if you create it.
OK, pull request follows:
The following changes since commit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868:
Linux 6.0-rc1 (2022-08-14 15:50:18 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-ksmbd
for you to fetch changes up to f2ea6d96500dd8947467f774d70700c1ba3ed8ef:
ksmbd: constify struct path (2022-08-20 10:54:48 -0400)
----------------------------------------------------------------
assorted ksmbd cleanups
Al Viro <[email protected]>
----------------------------------------------------------------
Al Viro (3):
ksmbd: don't open-code file_path()
ksmbd: don't open-code %pD
ksmbd: constify struct path
fs/ksmbd/misc.c | 2 +- fs/ksmbd/misc.h | 2 +- fs/ksmbd/smb2pdu.c | 33 ++++++++++++++++----------------- fs/ksmbd/smbacl.c | 6 +++--- fs/ksmbd/smbacl.h | 6 +++--- fs/ksmbd/vfs.c | 18 ++++++++---------- fs/ksmbd/vfs.h | 2 +- 7 files changed, 33 insertions(+), 36 deletions(-)
Steve French
AppliedRe: [PATCH 4/5] ksmbd: don't open-code %pf
merged into ksmbd-for-next
Quoted 44 lines · Al Viro
Quoted 8 lines · Namjae Jeon
Quoted 4 lines
OK... FWIW, I've another ksmbd patch hanging around and it might be less PITA if I put it + those two patches into never-rebased branch (for-ksmbd) for ksmbd folks to pull from. Fewer pointless conflicts that way...
Okay, Thanks for this. I'm trying to resend "ksmbd: fix racy issue from using ->d_parent and ->d_name" patch to you, but It conflict with these patches:)
We will pull them from that branch if you create it.OK, pull request follows:
The following changes since commit
568035b01cfb107af8d2e4bd2fb9aea22cf5b868:Linux 6.0-rc1 (2022-08-14 15:50:18 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.gittags/pull-ksmbdfor you to fetch changes up to
f2ea6d96500dd8947467f774d70700c1ba3ed8ef:ksmbd: constify struct path (2022-08-20 10:54:48 -0400)
----------------------------------------------------------------
assorted ksmbd cleanupsAl Viro <[email protected]>
----------------------------------------------------------------
Al Viro (3):
ksmbd: don't open-codefile_path()
ksmbd: don't open-code %pD
ksmbd: constify struct pathfs/ksmbd/misc.c | 2 +- fs/ksmbd/misc.h | 2 +- fs/ksmbd/smb2pdu.c | 33 ++++++++++++++++----------------- fs/ksmbd/smbacl.c | 6 +++--- fs/ksmbd/smbacl.h | 6 +++--- fs/ksmbd/vfs.c | 18 ++++++++---------- fs/ksmbd/vfs.h | 2 +- 7 files changed, 33 insertions(+), 36 deletions(-)
Signature · 3 lines
Thanks, Steve
Al Viro
maintainerPATCH 5/5 d_path.c: typo fix...
In reply to Al Viro--- fs/d_path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/d_path.c +1 -1
@@ -34,7 +34,7 @@ static bool prepend_char(struct prepend_buffer *p, unsigned char c) }/* -* The source of the prepend data can be an optimistoc load +* The source of the prepend data can be an optimistic load * of a dentry name and length. And because we don't hold any * locks, the length and the pointer to the name may not be * in sync if a concurrent rename happens, and the kernel
Signature · 1 line
2.30.2