Make __d_move() clear DCACHE_ENCRYPTED_NAME on the source dentry. This is needed for when d_splice_alias() moves a directory's encrypted alias to its decrypted alias as a result of the encryption key being added. Otherwise, the decrypted alias will incorrectly be invalidated on the next lookup, causing problems such as unmounting a mount the user just mount()ed there. Note that we don't have to support arbitrary moves of this flag because fscrypt doesn't allow dentries with DCACHE_ENCRYPTED_NAME to be the source or target of a rename().
Unified · Split
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
| 21 | #include <linux/fscrypt.h> | ||
| 21 | #include <linux/fsnotify.h> | 22 | #include <linux/fsnotify.h> |
| 22 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| @@ -2795,6 +2796,7 @@ static void __d_move(struct dentry *dentry, struct dentry *target, · 2771 unmodified lines | |||
| 2795 | list_move(&dentry->d_child, &dentry->d_parent->d_subdirs); | 2796 | list_move(&dentry->d_child, &dentry->d_parent->d_subdirs); |
| 2796 | __d_rehash(dentry); | 2797 | __d_rehash(dentry); |
| 2797 | fsnotify_update_flags(dentry); | 2798 | fsnotify_update_flags(dentry); |
| 2799 | fscrypt_handle_d_move(dentry); | ||
| 2798 | 2800 | ||
| 2799 | write_seqcount_end(&target->d_seq); | 2801 | write_seqcount_end(&target->d_seq); |
| 2800 | write_seqcount_end(&dentry->d_seq); | 2802 | write_seqcount_end(&dentry->d_seq); |
| @@ -89,6 +89,18 @@ static inline bool fscrypt_dummy_context_enabled(struct inode *inode) · 88 unmodified lines | |||
| 89 | inode->i_sb->s_cop->dummy_context(inode); | 89 | inode->i_sb->s_cop->dummy_context(inode); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | /* | ||
| 93 | * When d_splice_alias() moves a directory's encrypted alias to its decrypted | ||
| 94 | * alias as a result of the encryption key being added, DCACHE_ENCRYPTED_NAME | ||
| 95 | * must be cleared. Note that we don't have to support arbitrary moves of this | ||
| 96 | * flag because fscrypt doesn't allow encrypted aliases to be the source or | ||
| 97 | * target of a rename(). | ||
| 98 | */ | ||
| 99 | static inline void fscrypt_handle_d_move(struct dentry *dentry) | ||
| 100 | { | ||
| 101 | dentry->d_flags &= ~DCACHE_ENCRYPTED_NAME; | ||
| 102 | } | ||
| 103 | |||
| 92 | /* crypto.c */ | 104 | /* crypto.c */ |
| 93 | extern void fscrypt_enqueue_decrypt_work(struct work_struct *); | 105 | extern void fscrypt_enqueue_decrypt_work(struct work_struct *); |
| 94 | extern struct fscrypt_ctx *fscrypt_get_ctx(gfp_t); | 106 | extern struct fscrypt_ctx *fscrypt_get_ctx(gfp_t); |
| @@ -244,6 +256,10 @@ static inline bool fscrypt_dummy_context_enabled(struct inode *inode) · 149 unmodified lines | |||
| 244 | return false; | 256 | return false; |
| 245 | } | 257 | } |
| 246 | 258 | ||
| 259 | static inline void fscrypt_handle_d_move(struct dentry *dentry) | ||
| 260 | { | ||
| 261 | } | ||
| 262 | |||
| 247 | /* crypto.c */ | 263 | /* crypto.c */ |
| 248 | static inline void fscrypt_enqueue_decrypt_work(struct work_struct *work) | 264 | static inline void fscrypt_enqueue_decrypt_work(struct work_struct *work) |
| 249 | { | 265 | { |