Merge tag 'hardening-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[platform/kernel/linux-starfive.git] / fs / ksmbd / smb2pdu.c

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 31f00ce..ae7a3b0 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -2487,9 +2487,9 @@ static void ksmbd_acls_fattr(struct smb_fattr *fattr,
        fattr->cf_dacls = NULL;
 
        if (IS_ENABLED(CONFIG_FS_POSIX_ACL)) {
-               fattr->cf_acls = get_acl(inode, ACL_TYPE_ACCESS);
+               fattr->cf_acls = get_inode_acl(inode, ACL_TYPE_ACCESS);
                if (S_ISDIR(inode->i_mode))
-                       fattr->cf_dacls = get_acl(inode, ACL_TYPE_DEFAULT);
+                       fattr->cf_dacls = get_inode_acl(inode, ACL_TYPE_DEFAULT);
        }
 }
 
@@ -2956,7 +2956,7 @@ int smb2_open(struct ksmbd_work *work)
                struct inode *inode = d_inode(path.dentry);
 
                posix_acl_rc = ksmbd_vfs_inherit_posix_acl(user_ns,
-                                                          inode,
+                                                          path.dentry,
                                                           d_inode(path.dentry->d_parent));
                if (posix_acl_rc)
                        ksmbd_debug(SMB, "inherit posix acl failed : %d\n", posix_acl_rc);
@@ -2972,7 +2972,7 @@ int smb2_open(struct ksmbd_work *work)
                        if (rc) {
                                if (posix_acl_rc)
                                        ksmbd_vfs_set_init_posix_acl(user_ns,
-                                                                    inode);
+                                                                    path.dentry);
 
                                if (test_share_config_flag(work->tcon->share_conf,
                                                           KSMBD_SHARE_FLAG_ACL_XATTR)) {