]> git.karo-electronics.de Git - linux-beck.git/commitdiff
f2fs crypto: allow setting encryption policy once
authorChao Yu <chao2.yu@samsung.com>
Mon, 25 May 2015 10:09:03 +0000 (18:09 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Mon, 1 Jun 2015 23:21:06 +0000 (16:21 -0700)
This patch add XATTR_CREATE flag in setxattr when setting encryption
context for inode. Without this flag the context could be set more than
once, this should never happen. So, fix it.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/crypto_policy.c

index bef254b21815a5648a17d566a48a7455bf243a59..30b0b73d42000389daead63fd322d1737afecc1e 100644 (file)
@@ -83,7 +83,7 @@ static int f2fs_create_encryption_context_from_policy(
 
        return f2fs_setxattr(inode, F2FS_XATTR_INDEX_ENCRYPTION,
                        F2FS_XATTR_NAME_ENCRYPTION_CONTEXT, &ctx,
-                       sizeof(ctx), NULL, 0);
+                       sizeof(ctx), NULL, XATTR_CREATE);
 }
 
 int f2fs_process_policy(const struct f2fs_encryption_policy *policy,
@@ -202,5 +202,5 @@ int f2fs_inherit_context(struct inode *parent, struct inode *child,
        get_random_bytes(ctx.nonce, F2FS_KEY_DERIVATION_NONCE_SIZE);
        return f2fs_setxattr(child, F2FS_XATTR_INDEX_ENCRYPTION,
                                F2FS_XATTR_NAME_ENCRYPTION_CONTEXT, &ctx,
-                               sizeof(ctx), ipage, 0);
+                               sizeof(ctx), ipage, XATTR_CREATE);
 }