Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-block.git] / fs / ubifs / dir.c

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index a2ea4856e67b127e97b56d505f2b694df1f57d1a..9d7fb88e172e3d2f17acff5a72f432a8d3e5bddd 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -1138,38 +1138,24 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry,
        struct ubifs_info *c = dir->i_sb->s_fs_info;
        int err, len = strlen(symname);
        int sz_change = CALC_DENT_SIZE(len);
-       struct fscrypt_str disk_link = FSTR_INIT((char *)symname, len + 1);
-       struct fscrypt_symlink_data *sd = NULL;
+       struct fscrypt_str disk_link;
        struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
                                        .new_ino_d = ALIGN(len, 8),
                                        .dirtied_ino = 1 };
        struct fscrypt_name nm;
 
-       if (ubifs_crypt_is_encrypted(dir)) {
-               err = fscrypt_get_encryption_info(dir);
-               if (err)
-                       goto out_budg;
-
-               if (!fscrypt_has_encryption_key(dir)) {
-                       err = -EPERM;
-                       goto out_budg;
-               }
+       dbg_gen("dent '%pd', target '%s' in dir ino %lu", dentry,
+               symname, dir->i_ino);
 
-               disk_link.len = (fscrypt_fname_encrypted_size(dir, len) +
-                               sizeof(struct fscrypt_symlink_data));
-       }
+       err = fscrypt_prepare_symlink(dir, symname, len, UBIFS_MAX_INO_DATA,
+                                     &disk_link);
+       if (err)
+               return err;
 
        /*
         * Budget request settings: new inode, new direntry and changing parent
         * directory inode.
         */
-
-       dbg_gen("dent '%pd', target '%s' in dir ino %lu", dentry,
-               symname, dir->i_ino);
-
-       if (disk_link.len > UBIFS_MAX_INO_DATA)
-               return -ENAMETOOLONG;
-
        err = ubifs_budget_space(c, &req);
        if (err)
                return err;
@@ -1191,38 +1177,20 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry,
                goto out_inode;
        }
 
-       if (ubifs_crypt_is_encrypted(dir)) {
-               struct qstr istr = QSTR_INIT(symname, len);
-               struct fscrypt_str ostr;
-
-               sd = kzalloc(disk_link.len, GFP_NOFS);
-               if (!sd) {
-                       err = -ENOMEM;
-                       goto out_inode;
-               }
-
-               ostr.name = sd->encrypted_path;
-               ostr.len = disk_link.len;
-
-               err = fscrypt_fname_usr_to_disk(inode, &istr, &ostr);
-               if (err) {
-                       kfree(sd);
+       if (IS_ENCRYPTED(inode)) {
+               disk_link.name = ui->data; /* encrypt directly into ui->data */
+               err = fscrypt_encrypt_symlink(inode, symname, len, &disk_link);
+               if (err)
                        goto out_inode;
-               }
-
-               sd->len = cpu_to_le16(ostr.len);
-               disk_link.name = (char *)sd;
        } else {
+               memcpy(ui->data, disk_link.name, disk_link.len);
                inode->i_link = ui->data;
        }
 
-       memcpy(ui->data, disk_link.name, disk_link.len);
-       ((char *)ui->data)[disk_link.len - 1] = '\0';
-
        /*
         * The terminating zero byte is not written to the flash media and it
         * is put just to make later in-memory string processing simpler. Thus,
-        * data length is @len, not @len + %1.
+        * data length is @disk_link.len - 1, not @disk_link.len.
         */
        ui->data_len = disk_link.len - 1;
        inode->i_size = ubifs_inode(inode)->ui_size = disk_link.len - 1;
@@ -1240,11 +1208,10 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry,
                goto out_cancel;
        mutex_unlock(&dir_ui->ui_mutex);
 
-       ubifs_release_budget(c, &req);
        insert_inode_hash(inode);
        d_instantiate(dentry, inode);
-       fscrypt_free_filename(&nm);
-       return 0;
+       err = 0;
+       goto out_fname;
 
 out_cancel:
        dir->i_size -= sz_change;