mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-26 22:07:51 +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>
104 lines
3.5 KiB
Diff
104 lines
3.5 KiB
Diff
From e59d3b46da925bd4b53d761bd7cf34aea4c7c01d Mon Sep 17 00:00:00 2001
|
|
From: Tyler Hicks <tyhicks@canonical.com>
|
|
Date: Tue, 24 Jan 2012 10:02:22 -0600
|
|
Subject: [PATCH 07/90] eCryptfs: Fix oops when printing debug info in extent
|
|
crypto functions
|
|
|
|
commit 58ded24f0fcb85bddb665baba75892f6ad0f4b8a upstream.
|
|
|
|
If pages passed to the eCryptfs extent-based crypto functions are not
|
|
mapped and the module parameter ecryptfs_verbosity=1 was specified at
|
|
loading time, a NULL pointer dereference will occur.
|
|
|
|
Note that this wouldn't happen on a production system, as you wouldn't
|
|
pass ecryptfs_verbosity=1 on a production system. It leaks private
|
|
information to the system logs and is for debugging only.
|
|
|
|
The debugging info printed in these messages is no longer very useful
|
|
and rather than doing a kmap() in these debugging paths, it will be
|
|
better to simply remove the debugging paths completely.
|
|
|
|
https://launchpad.net/bugs/913651
|
|
|
|
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
fs/ecryptfs/crypto.c | 40 ----------------------------------------
|
|
1 file changed, 40 deletions(-)
|
|
|
|
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
|
|
index 2bf5203..68b19ab 100644
|
|
--- a/fs/ecryptfs/crypto.c
|
|
+++ b/fs/ecryptfs/crypto.c
|
|
@@ -417,17 +417,6 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page,
|
|
(unsigned long long)(extent_base + extent_offset), rc);
|
|
goto out;
|
|
}
|
|
- if (unlikely(ecryptfs_verbosity > 0)) {
|
|
- ecryptfs_printk(KERN_DEBUG, "Encrypting extent "
|
|
- "with iv:\n");
|
|
- ecryptfs_dump_hex(extent_iv, crypt_stat->iv_bytes);
|
|
- ecryptfs_printk(KERN_DEBUG, "First 8 bytes before "
|
|
- "encryption:\n");
|
|
- ecryptfs_dump_hex((char *)
|
|
- (page_address(page)
|
|
- + (extent_offset * crypt_stat->extent_size)),
|
|
- 8);
|
|
- }
|
|
rc = ecryptfs_encrypt_page_offset(crypt_stat, enc_extent_page, 0,
|
|
page, (extent_offset
|
|
* crypt_stat->extent_size),
|
|
@@ -440,14 +429,6 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page,
|
|
goto out;
|
|
}
|
|
rc = 0;
|
|
- if (unlikely(ecryptfs_verbosity > 0)) {
|
|
- ecryptfs_printk(KERN_DEBUG, "Encrypt extent [0x%.16llx]; "
|
|
- "rc = [%d]\n",
|
|
- (unsigned long long)(extent_base + extent_offset), rc);
|
|
- ecryptfs_printk(KERN_DEBUG, "First 8 bytes after "
|
|
- "encryption:\n");
|
|
- ecryptfs_dump_hex((char *)(page_address(enc_extent_page)), 8);
|
|
- }
|
|
out:
|
|
return rc;
|
|
}
|
|
@@ -543,17 +524,6 @@ static int ecryptfs_decrypt_extent(struct page *page,
|
|
(unsigned long long)(extent_base + extent_offset), rc);
|
|
goto out;
|
|
}
|
|
- if (unlikely(ecryptfs_verbosity > 0)) {
|
|
- ecryptfs_printk(KERN_DEBUG, "Decrypting extent "
|
|
- "with iv:\n");
|
|
- ecryptfs_dump_hex(extent_iv, crypt_stat->iv_bytes);
|
|
- ecryptfs_printk(KERN_DEBUG, "First 8 bytes before "
|
|
- "decryption:\n");
|
|
- ecryptfs_dump_hex((char *)
|
|
- (page_address(enc_extent_page)
|
|
- + (extent_offset * crypt_stat->extent_size)),
|
|
- 8);
|
|
- }
|
|
rc = ecryptfs_decrypt_page_offset(crypt_stat, page,
|
|
(extent_offset
|
|
* crypt_stat->extent_size),
|
|
@@ -567,16 +537,6 @@ static int ecryptfs_decrypt_extent(struct page *page,
|
|
goto out;
|
|
}
|
|
rc = 0;
|
|
- if (unlikely(ecryptfs_verbosity > 0)) {
|
|
- ecryptfs_printk(KERN_DEBUG, "Decrypt extent [0x%.16llx]; "
|
|
- "rc = [%d]\n",
|
|
- (unsigned long long)(extent_base + extent_offset), rc);
|
|
- ecryptfs_printk(KERN_DEBUG, "First 8 bytes after "
|
|
- "decryption:\n");
|
|
- ecryptfs_dump_hex((char *)(page_address(page)
|
|
- + (extent_offset
|
|
- * crypt_stat->extent_size)), 8);
|
|
- }
|
|
out:
|
|
return rc;
|
|
}
|
|
--
|
|
1.7.9.4
|
|
|