From: Greg Kroah-Hartman Date: Tue, 7 Dec 2010 20:26:12 +0000 (-0800) Subject: .36 patches X-Git-Tag: v2.6.27.57~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c18580c671dbfbcb4ab925986776951a987057d;p=thirdparty%2Fkernel%2Fstable-queue.git .36 patches --- diff --git a/queue-2.6.36/crypto-padlock-fix-aes-cbc-handling-on-odd-block-sized-input.patch b/queue-2.6.36/crypto-padlock-fix-aes-cbc-handling-on-odd-block-sized-input.patch new file mode 100644 index 00000000000..d85d885bf68 --- /dev/null +++ b/queue-2.6.36/crypto-padlock-fix-aes-cbc-handling-on-odd-block-sized-input.patch @@ -0,0 +1,37 @@ +From c054a076a1bd4731820a9c4d638b13d5c9bf5935 Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Thu, 4 Nov 2010 14:38:39 -0400 +Subject: crypto: padlock - Fix AES-CBC handling on odd-block-sized input + +From: Herbert Xu + +commit c054a076a1bd4731820a9c4d638b13d5c9bf5935 upstream. + +On certain VIA chipsets AES-CBC requires the input/output to be +a multiple of 64 bytes. We had a workaround for this but it was +buggy as it sent the whole input for processing when it is meant +to only send the initial number of blocks which makes the rest +a multiple of 64 bytes. + +As expected this causes memory corruption whenever the workaround +kicks in. + +Reported-by: Phil Sutter +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/crypto/padlock-aes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/crypto/padlock-aes.c ++++ b/drivers/crypto/padlock-aes.c +@@ -286,7 +286,7 @@ static inline u8 *padlock_xcrypt_cbc(con + if (initial) + asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ + : "+S" (input), "+D" (output), "+a" (iv) +- : "d" (control_word), "b" (key), "c" (count)); ++ : "d" (control_word), "b" (key), "c" (initial)); + + asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ + : "+S" (input), "+D" (output), "+a" (iv) diff --git a/queue-2.6.36/ext4-fix-null-pointer-dereference-in-print_daily_error_info.patch b/queue-2.6.36/ext4-fix-null-pointer-dereference-in-print_daily_error_info.patch new file mode 100644 index 00000000000..784e2fae4ef --- /dev/null +++ b/queue-2.6.36/ext4-fix-null-pointer-dereference-in-print_daily_error_info.patch @@ -0,0 +1,34 @@ +From a1c6c5698d53db4c47a25c3a8d11731a4d7b8370 Mon Sep 17 00:00:00 2001 +From: Sergey Senozhatsky +Date: Wed, 27 Oct 2010 21:30:04 -0400 +Subject: ext4: fix NULL pointer dereference in print_daily_error_info() + +From: Sergey Senozhatsky + +commit a1c6c5698d53db4c47a25c3a8d11731a4d7b8370 upstream. + +Fix NULL pointer dereference in print_daily_error_info, when +called on unmounted fs (EXT4_SB(sb) returns NULL), by removing error +reporting timer in ext4_put_super. + +Google-Bug-Id: 3017663 + +Signed-off-by: Sergey Senozhatsky +Signed-off-by: "Theodore Ts'o" +Cc: Thomas Meyer +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ext4/super.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -719,6 +719,7 @@ static void ext4_put_super(struct super_ + ext4_abort(sb, "Couldn't clean up the journal"); + } + ++ del_timer(&sbi->s_err_report); + ext4_release_system_zone(sb); + ext4_mb_release(sb); + ext4_ext_release(sb); diff --git a/queue-2.6.36/series b/queue-2.6.36/series index 1c17ad235db..209555ce287 100644 --- a/queue-2.6.36/series +++ b/queue-2.6.36/series @@ -271,3 +271,5 @@ kbuild-use-getopt_long-not-its-_only-variant.patch filter-make-sure-filters-dont-read-uninitialized-memory.patch can-bcm-fix-minor-heap-overflow.patch x25-prevent-crashing-when-parsing-bad-x.25-facilities.patch +crypto-padlock-fix-aes-cbc-handling-on-odd-block-sized-input.patch +ext4-fix-null-pointer-dereference-in-print_daily_error_info.patch