Updated from Linux LTS 3.10.18 to 3.10.19
This commit is contained in:
@@ -1149,7 +1149,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
|
||||
struct ecryptfs_msg_ctx *msg_ctx;
|
||||
struct ecryptfs_message *msg = NULL;
|
||||
char *auth_tok_sig;
|
||||
char *payload;
|
||||
char *payload = NULL;
|
||||
size_t payload_len = 0;
|
||||
int rc;
|
||||
|
||||
@@ -1203,6 +1203,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
|
||||
}
|
||||
out:
|
||||
kfree(msg);
|
||||
kfree(payload);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
|
||||
|
||||
if (insert_inode_locked(inode) < 0) {
|
||||
rc = -EINVAL;
|
||||
goto fail_unlock;
|
||||
goto fail_put;
|
||||
}
|
||||
|
||||
inode_init_owner(inode, parent, mode);
|
||||
@@ -156,7 +156,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
|
||||
fail_drop:
|
||||
dquot_drop(inode);
|
||||
inode->i_flags |= S_NOQUOTA;
|
||||
fail_unlock:
|
||||
clear_nlink(inode);
|
||||
unlock_new_inode(inode);
|
||||
fail_put:
|
||||
|
||||
@@ -328,6 +328,8 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence)
|
||||
m->read_pos = offset;
|
||||
retval = file->f_pos = offset;
|
||||
}
|
||||
} else {
|
||||
file->f_pos = offset;
|
||||
}
|
||||
}
|
||||
file->f_version = m->version;
|
||||
|
||||
Reference in New Issue
Block a user