lkml.org 
[lkml]   [2015]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the vfs tree with the ext4 tree
Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/ext4/symlink.c between commit 8ee224253787 ("ext4 crypto: Add
symlink encryption") from the ext4 tree and commit 5dd3dc06371a ("VFS:
normal filesystems (and lustre): d_inode() annotations") from the vfs
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc fs/ext4/symlink.c
index 839f71e941a9,57f50091b8d1..000000000000
--- a/fs/ext4/symlink.c
+++ b/fs/ext4/symlink.c
@@@ -21,107 -21,11 +21,107 @@@
#include <linux/namei.h>
#include "ext4.h"
#include "xattr.h"
+#include "ext4_crypto.h"

+#ifdef CONFIG_EXT4_FS_ENCRYPTION
static void *ext4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
+ struct page *cpage = NULL;
+ char *caddr, *paddr;
+ struct ext4_str cstr, pstr;
- struct inode *inode = dentry->d_inode;
++ struct inode *inode = d_inode(dentry);
+ struct ext4_fname_crypto_ctx *ctx = NULL;
+ struct ext4_encrypted_symlink_data *sd;
+ loff_t size = min(inode->i_size, (loff_t) PAGE_SIZE-1);
+ int res;
+ u32 plen, plen2;
+
+ ctx = ext4_get_fname_crypto_ctx(inode, inode->i_sb->s_blocksize);
+ if (IS_ERR(ctx))
+ return ctx;
+
+ cpage = read_mapping_page(inode->i_mapping, 0, NULL);
+ if (IS_ERR(cpage)) {
+ ext4_put_fname_crypto_ctx(&ctx);
+ return cpage;
+ }
+ caddr = kmap(cpage);
+ caddr[size] = 0;
+
+ if (!ctx) {
+ /* Symlink is unencrypted */
+ plen = strnlen((char *)caddr, inode->i_sb->s_blocksize);
+ plen2 = (plen < inode->i_sb->s_blocksize) ? plen + 1 : plen;
+ paddr = kmalloc(plen2, GFP_NOFS);
+ if (!paddr) {
+ ext4_put_fname_crypto_ctx(&ctx);
+ kunmap(cpage);
+ page_cache_release(cpage);
+ return ERR_PTR(-ENOMEM);
+ }
+ memcpy(paddr, caddr, plen);
+ if (plen < inode->i_sb->s_blocksize)
+ paddr[plen] = '\0';
+ } else {
+ /* Symlink is encrypted */
+ sd = (struct ext4_encrypted_symlink_data *)caddr;
+ cstr.name = sd->encrypted_path;
+ cstr.len = le32_to_cpu(sd->len);
+ if ((cstr.len + sizeof(struct ext4_encrypted_symlink_data) - 1)
+ > inode->i_sb->s_blocksize) {
+ /* Symlink data on the disk is corrupted */
+ kunmap(cpage);
+ page_cache_release(cpage);
+ return ERR_PTR(-EIO);
+ }
+ plen = (cstr.len < EXT4_FNAME_CRYPTO_DIGEST_SIZE*2)
+ ? EXT4_FNAME_CRYPTO_DIGEST_SIZE*2
+ : cstr.len;
+ paddr = kmalloc(plen + 1, GFP_NOFS);
+ if (!paddr) {
+ ext4_put_fname_crypto_ctx(&ctx);
+ kunmap(cpage);
+ page_cache_release(cpage);
+ return ERR_PTR(-ENOMEM);
+ }
+ pstr.name = paddr;
+ res = _ext4_fname_disk_to_usr(ctx, &cstr, &pstr);
+ if (res < 0) {
+ ext4_put_fname_crypto_ctx(&ctx);
+ kunmap(cpage);
+ page_cache_release(cpage);
+ kfree(paddr);
+ return ERR_PTR(res);
+ }
+ /* Null-terminate the name */
+ if (res <= plen)
+ paddr[res] = '\0';
+ }
+ nd_set_link(nd, paddr);
+ ext4_put_fname_crypto_ctx(&ctx);
+ return cpage;
+}
+
+static void ext4_put_link(struct dentry *dentry, struct nameidata *nd,
+ void *cookie)
+{
+ struct page *page = cookie;
+ char *buf = nd_get_link(nd);
+
+ if (page) {
+ kunmap(page);
+ page_cache_release(page);
+ }
+ if (buf) {
+ nd_set_link(nd, NULL);
+ kfree(buf);
+ }
+}
+#endif
+
+static void *ext4_follow_fast_link(struct dentry *dentry, struct nameidata *nd)
+{
- struct ext4_inode_info *ei = EXT4_I(dentry->d_inode);
+ struct ext4_inode_info *ei = EXT4_I(d_inode(dentry));
nd_set_link(nd, (char *) ei->i_data);
return NULL;
}
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-04-13 04:21    [W:0.028 / U:0.732 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site