summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Gstir <david@sigma-star.at>2017-05-17 13:36:16 +0200
committerRichard Weinberger <richard@nod.at>2017-07-14 22:49:05 +0200
commitf34e87f58dabc31eb69f61cf4a79e951d4176743 (patch)
tree3f7c4f599185777025667f0af650ee86d065ede2 /fs
parentbb50c63244687706e11c9b636a5ad3090cd783ac (diff)
downloadlinux-f34e87f58dabc31eb69f61cf4a79e951d4176743.tar.bz2
ubifs: Don't encrypt special files on creation
When a new inode is created, we check if the containing folder has a encryption policy set and inherit that. This should however only be done for regular files, links and subdirectories. Not for sockes fifos etc. Fixes: d475a507457b ("ubifs: Add skeleton for fscrypto") Cc: stable@vger.kernel.org Signed-off-by: David Gstir <david@sigma-star.at> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/dir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 996e4215fd28..90a3f01c55d1 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -143,6 +143,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, struct inode *dir,
case S_IFBLK:
case S_IFCHR:
inode->i_op = &ubifs_file_inode_operations;
+ encrypted = false;
break;
default:
BUG();