mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
ebbeb55561
Also add script used to generate patches and SRC_URI Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
From a093f99cc6e708ede0b0aa3096cb1f9b34b6a36c Mon Sep 17 00:00:00 2001
|
|
From: Tyler Hicks <tyhicks@canonical.com>
|
|
Date: Wed, 18 Jan 2012 18:30:04 -0600
|
|
Subject: [PATCH 05/90] eCryptfs: Make truncate path killable
|
|
|
|
commit 5e6f0d769017cc49207ef56996e42363ec26c1f0 upstream.
|
|
|
|
ecryptfs_write() handles the truncation of eCryptfs inodes. It grabs a
|
|
page, zeroes out the appropriate portions, and then encrypts the page
|
|
before writing it to the lower filesystem. It was unkillable and due to
|
|
the lack of sparse file support could result in tying up a large portion
|
|
of system resources, while encrypting pages of zeros, with no way for
|
|
the truncate operation to be stopped from userspace.
|
|
|
|
This patch adds the ability for ecryptfs_write() to detect a pending
|
|
fatal signal and return as gracefully as possible. The intent is to
|
|
leave the lower file in a useable state, while still allowing a user to
|
|
break out of the encryption loop. If a pending fatal signal is detected,
|
|
the eCryptfs inode size is updated to reflect the modified inode size
|
|
and then -EINTR is returned.
|
|
|
|
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
fs/ecryptfs/read_write.c | 19 ++++++++++++++-----
|
|
1 file changed, 14 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
|
|
index 3745f7c..54eb14c 100644
|
|
--- a/fs/ecryptfs/read_write.c
|
|
+++ b/fs/ecryptfs/read_write.c
|
|
@@ -132,6 +132,11 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
|
|
size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page);
|
|
size_t total_remaining_bytes = ((offset + size) - pos);
|
|
|
|
+ if (fatal_signal_pending(current)) {
|
|
+ rc = -EINTR;
|
|
+ break;
|
|
+ }
|
|
+
|
|
if (num_bytes > total_remaining_bytes)
|
|
num_bytes = total_remaining_bytes;
|
|
if (pos < offset) {
|
|
@@ -193,15 +198,19 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
|
|
}
|
|
pos += num_bytes;
|
|
}
|
|
- if ((offset + size) > ecryptfs_file_size) {
|
|
- i_size_write(ecryptfs_inode, (offset + size));
|
|
+ if (pos > ecryptfs_file_size) {
|
|
+ i_size_write(ecryptfs_inode, pos);
|
|
if (crypt_stat->flags & ECRYPTFS_ENCRYPTED) {
|
|
- rc = ecryptfs_write_inode_size_to_metadata(
|
|
+ int rc2;
|
|
+
|
|
+ rc2 = ecryptfs_write_inode_size_to_metadata(
|
|
ecryptfs_inode);
|
|
- if (rc) {
|
|
+ if (rc2) {
|
|
printk(KERN_ERR "Problem with "
|
|
"ecryptfs_write_inode_size_to_metadata; "
|
|
- "rc = [%d]\n", rc);
|
|
+ "rc = [%d]\n", rc2);
|
|
+ if (!rc)
|
|
+ rc = rc2;
|
|
goto out;
|
|
}
|
|
}
|
|
--
|
|
1.7.9.4
|
|
|