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>
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From 0ce49bba7ef708a2a8673e20a23fa174556ef3bb Mon Sep 17 00:00:00 2001
|
|
From: Tim Gardner <tim.gardner@canonical.com>
|
|
Date: Thu, 12 Jan 2012 16:31:55 +0100
|
|
Subject: [PATCH 04/90] ecryptfs: Improve metadata read failure logging
|
|
|
|
commit 30373dc0c87ffef68d5628e77d56ffb1fa22e1ee upstream.
|
|
|
|
Print inode on metadata read failure. The only real
|
|
way of dealing with metadata read failures is to delete
|
|
the underlying file system file. Having the inode
|
|
allows one to 'find . -inum INODE`.
|
|
|
|
[tyhicks@canonical.com: Removed some minor not-for-stable parts]
|
|
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
|
|
Reviewed-by: Kees Cook <keescook@chromium.org>
|
|
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
fs/ecryptfs/crypto.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
|
|
index 2a83425..2bf5203 100644
|
|
--- a/fs/ecryptfs/crypto.c
|
|
+++ b/fs/ecryptfs/crypto.c
|
|
@@ -1620,7 +1620,8 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
|
|
rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_inode);
|
|
if (rc) {
|
|
printk(KERN_DEBUG "Valid eCryptfs headers not found in "
|
|
- "file header region or xattr region\n");
|
|
+ "file header region or xattr region, inode %lu\n",
|
|
+ ecryptfs_inode->i_ino);
|
|
rc = -EINVAL;
|
|
goto out;
|
|
}
|
|
@@ -1629,7 +1630,8 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
|
|
ECRYPTFS_DONT_VALIDATE_HEADER_SIZE);
|
|
if (rc) {
|
|
printk(KERN_DEBUG "Valid eCryptfs headers not found in "
|
|
- "file xattr region either\n");
|
|
+ "file xattr region either, inode %lu\n",
|
|
+ ecryptfs_inode->i_ino);
|
|
rc = -EINVAL;
|
|
}
|
|
if (crypt_stat->mount_crypt_stat->flags
|
|
@@ -1640,7 +1642,8 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
|
|
"crypto metadata only in the extended attribute "
|
|
"region, but eCryptfs was mounted without "
|
|
"xattr support enabled. eCryptfs will not treat "
|
|
- "this like an encrypted file.\n");
|
|
+ "this like an encrypted file, inode %lu\n",
|
|
+ ecryptfs_inode->i_ino);
|
|
rc = -EINVAL;
|
|
}
|
|
}
|
|
--
|
|
1.7.9.4
|
|
|