From 592f96a7e487c4841bcadfb817b642f8f0a79bda Mon Sep 17 00:00:00 2001 From: Chuck Ebbert Date: Aug 14 2010 22:08:01 +0000 Subject: Linux 2.6.32.19 --- diff --git a/crypto-testmgr-add-null-test-for-aesni.patch b/crypto-testmgr-add-null-test-for-aesni.patch deleted file mode 100644 index b38a6f9..0000000 --- a/crypto-testmgr-add-null-test-for-aesni.patch +++ /dev/null @@ -1,138 +0,0 @@ -From: Youquan, Song -Date: Wed, 23 Dec 2009 11:45:20 +0000 (+0800) -Subject: crypto: testmgr - Fix complain about lack test for internal used algorithm -X-Git-Tag: v2.6.34-rc1~286^2~28 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=863b557a88f8c033f7419fabafef4712a5055f85 - -crypto: testmgr - Fix complain about lack test for internal used algorithm - -When load aesni-intel and ghash_clmulni-intel driver,kernel will complain no - test for some internal used algorithm. -The strange information as following: - -alg: No test for __aes-aesni (__driver-aes-aesni) -alg: No test for __ecb-aes-aesni (__driver-ecb-aes-aesni) -alg: No test for __cbc-aes-aesni (__driver-cbc-aes-aesni) -alg: No test for __ecb-aes-aesni (cryptd(__driver-ecb-aes-aesni) -alg: No test for __ghash (__ghash-pclmulqdqni) -alg: No test for __ghash (cryptd(__ghash-pclmulqdqni)) - -This patch add NULL test entries for these algorithm and driver. - -Signed-off-by: Youquan, Song -Signed-off-by: Ying, Huang -Signed-off-by: Herbert Xu ---- - -diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index 7620bfc..c494d76 100644 ---- a/crypto/testmgr.c -+++ b/crypto/testmgr.c -@@ -1477,9 +1477,54 @@ static int alg_test_cprng(const struct alg_test_desc *desc, const char *driver, - return err; - } - -+static int alg_test_null(const struct alg_test_desc *desc, -+ const char *driver, u32 type, u32 mask) -+{ -+ return 0; -+} -+ - /* Please keep this list sorted by algorithm name. */ - static const struct alg_test_desc alg_test_descs[] = { - { -+ .alg = "__driver-cbc-aes-aesni", -+ .test = alg_test_null, -+ .suite = { -+ .cipher = { -+ .enc = { -+ .vecs = NULL, -+ .count = 0 -+ }, -+ .dec = { -+ .vecs = NULL, -+ .count = 0 -+ } -+ } -+ } -+ }, { -+ .alg = "__driver-ecb-aes-aesni", -+ .test = alg_test_null, -+ .suite = { -+ .cipher = { -+ .enc = { -+ .vecs = NULL, -+ .count = 0 -+ }, -+ .dec = { -+ .vecs = NULL, -+ .count = 0 -+ } -+ } -+ } -+ }, { -+ .alg = "__ghash-pclmulqdqni", -+ .test = alg_test_null, -+ .suite = { -+ .hash = { -+ .vecs = NULL, -+ .count = 0 -+ } -+ } -+ }, { - .alg = "ansi_cprng", - .test = alg_test_cprng, - .fips_allowed = 1, -@@ -1623,6 +1668,30 @@ static const struct alg_test_desc alg_test_descs[] = { - } - } - }, { -+ .alg = "cryptd(__driver-ecb-aes-aesni)", -+ .test = alg_test_null, -+ .suite = { -+ .cipher = { -+ .enc = { -+ .vecs = NULL, -+ .count = 0 -+ }, -+ .dec = { -+ .vecs = NULL, -+ .count = 0 -+ } -+ } -+ } -+ }, { -+ .alg = "cryptd(__ghash-pclmulqdqni)", -+ .test = alg_test_null, -+ .suite = { -+ .hash = { -+ .vecs = NULL, -+ .count = 0 -+ } -+ } -+ }, { - .alg = "ctr(aes)", - .test = alg_test_skcipher, - .fips_allowed = 1, -@@ -1669,6 +1738,21 @@ static const struct alg_test_desc alg_test_descs[] = { - } - } - }, { -+ .alg = "ecb(__aes-aesni)", -+ .test = alg_test_null, -+ .suite = { -+ .cipher = { -+ .enc = { -+ .vecs = NULL, -+ .count = 0 -+ }, -+ .dec = { -+ .vecs = NULL, -+ .count = 0 -+ } -+ } -+ } -+ }, { - .alg = "ecb(aes)", - .test = alg_test_skcipher, - .fips_allowed = 1, diff --git a/ext4-fix-freeze-deadlock-under-io.patch b/ext4-fix-freeze-deadlock-under-io.patch deleted file mode 100644 index f50dee1..0000000 --- a/ext4-fix-freeze-deadlock-under-io.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Eric Sandeen -Date: Sun, 1 Aug 2010 21:33:29 +0000 (-0400) -Subject: ext4: fix freeze deadlock under IO -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=437f88cc031ffe7f37f3e705367f4fe1f4be8b0f - -ext4: fix freeze deadlock under IO - -Commit 6b0310fbf087ad6 caused a regression resulting in deadlocks -when freezing a filesystem which had active IO; the vfs_check_frozen -level (SB_FREEZE_WRITE) did not let the freeze-related IO syncing -through. Duh. - -Changing the test to FREEZE_TRANS should let the normal freeze -syncing get through the fs, but still block any transactions from -starting once the fs is completely frozen. - -I tested this by running fsstress in the background while periodically -snapshotting the fs and running fsck on the result. I ran into -occasional deadlocks, but different ones. I think this is a -fine fix for the problem at hand, and the other deadlocky things -will need more investigation. - -Reported-by: Phillip Susi -Signed-off-by: Eric Sandeen -Signed-off-by: "Theodore Ts'o" ---- - -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index e046eba..282a270 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -241,7 +241,7 @@ handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks) - if (sb->s_flags & MS_RDONLY) - return ERR_PTR(-EROFS); - -- vfs_check_frozen(sb, SB_FREEZE_WRITE); -+ vfs_check_frozen(sb, SB_FREEZE_TRANS); - /* Special case here: if the journal has aborted behind our - * backs (eg. EIO in the commit thread), then we still need to - * take the FS itself readonly cleanly. */ -@@ -3608,7 +3608,7 @@ int ext4_force_commit(struct super_block *sb) - - journal = EXT4_SB(sb)->s_journal; - if (journal) { -- vfs_check_frozen(sb, SB_FREEZE_WRITE); -+ vfs_check_frozen(sb, SB_FREEZE_TRANS); - ret = ext4_journal_force_commit(journal); - } - diff --git a/ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch b/ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch deleted file mode 100644 index 14407a5..0000000 --- a/ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1f5a81e41f8b1a782c68d3843e9ec1bfaadf7d72 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o -Date: Wed, 2 Jun 2010 22:04:39 -0400 -Subject: ext4: Make sure the MOVE_EXT ioctl can't overwrite append-only files - -From: Theodore Ts'o - -commit 1f5a81e41f8b1a782c68d3843e9ec1bfaadf7d72 upstream. - -Dan Roseberg has reported a problem with the MOVE_EXT ioctl. If the -donor file is an append-only file, we should not allow the operation -to proceed, lest we end up overwriting the contents of an append-only -file. - -Signed-off-by: "Theodore Ts'o" -Cc: Dan Rosenberg -Signed-off-by: Greg Kroah-Hartman - ---- - fs/ext4/move_extent.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/fs/ext4/move_extent.c -+++ b/fs/ext4/move_extent.c -@@ -959,6 +959,9 @@ mext_check_arguments(struct inode *orig_ - return -EINVAL; - } - -+ if (IS_IMMUTABLE(donor_inode) || IS_APPEND(donor_inode)) -+ return -EPERM; -+ - /* Ext4 move extent does not support swapfile */ - if (IS_SWAPFILE(orig_inode) || IS_SWAPFILE(donor_inode)) { - ext4_debug("ext4 move extent: The argument files should " diff --git a/kernel.spec b/kernel.spec index 14a4bb7..e90e10f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -47,7 +47,7 @@ Summary: The Linux kernel # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec). # scripts/rebase.sh should be made to do that for you, actually. # -%global baserelease 160 +%global baserelease 161 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -61,7 +61,7 @@ Summary: The Linux kernel # Do we have a -stable update to apply? %define stable_update 19 # Is it a -stable RC? -%define stable_rc 1 +%define stable_rc 0 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -769,7 +769,6 @@ Patch3050: linux-2.6-nfsd4-proots.patch Patch3051: linux-2.6-nfs4-callback-hidden.patch # btrfs -Patch3100: linux-2.6-btrfs-fix-acl.patch Patch3101: btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch # XFS @@ -836,12 +835,8 @@ Patch13030: l2tp-fix-oops-in-pppol2tp_xmit.patch Patch14020: inotify-fix-inotify-oneshot-support.patch Patch14030: inotify-send-IN_UNMOUNT-events.patch -Patch14040: crypto-testmgr-add-null-test-for-aesni.patch Patch14050: crypto-add-async-hash-testing.patch -Patch14110: ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch -Patch14120: ext4-fix-freeze-deadlock-under-io.patch - # Red Hat Bugzilla #610911 Patch14130: kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch @@ -1327,7 +1322,6 @@ ApplyPatch linux-2.6-execshield.patch # xfs # btrfs -#ApplyPatch linux-2.6-btrfs-fix-acl.patch ApplyPatch btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch # eCryptfs @@ -1553,16 +1547,9 @@ ApplyPatch l2tp-fix-oops-in-pppol2tp_xmit.patch ApplyPatch inotify-fix-inotify-oneshot-support.patch ApplyPatch inotify-send-IN_UNMOUNT-events.patch -# add tests for aesni module (#571577) -#ApplyPatch crypto-testmgr-add-null-test-for-aesni.patch # add tests for crypto async hashing (#571577) ApplyPatch crypto-add-async-hash-testing.patch -# CVE-2010-2066 -#ApplyPatch ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch -# Fix deadlock caused by patch in 2.6.32.17 -#ApplyPatch ext4-fix-freeze-deadlock-under-io.patch - ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch # RHBZ #592785 @@ -2219,6 +2206,9 @@ fi %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Sat Aug 14 2010 Chuck Ebbert 2.6.32.19-161 +- Linux 2.6.32.19 + * Fri Aug 13 2010 Chuck Ebbert 2.6.32.19-160.rc1 - Linux 2.6.32.19-rc1 - Comment out patches merged upstream: diff --git a/linux-2.6-btrfs-fix-acl.patch b/linux-2.6-btrfs-fix-acl.patch deleted file mode 100644 index 3e015da..0000000 --- a/linux-2.6-btrfs-fix-acl.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up linux-2.6.32.noarch/fs/btrfs/acl.c.orig linux-2.6.32.noarch/fs/btrfs/acl.c ---- linux-2.6.32.noarch/fs/btrfs/acl.c.orig 2009-12-02 22:51:21.000000000 -0500 -+++ linux-2.6.32.noarch/fs/btrfs/acl.c 2010-01-14 15:36:25.926371944 -0500 -@@ -110,13 +110,15 @@ static int btrfs_set_acl(struct inode *i - - switch (type) { - case ACL_TYPE_ACCESS: -- mode = inode->i_mode; -- ret = posix_acl_equiv_mode(acl, &mode); -- if (ret < 0) -- return ret; -- ret = 0; -- inode->i_mode = mode; - name = POSIX_ACL_XATTR_ACCESS; -+ if (acl) { -+ mode = inode->i_mode; -+ ret = posix_acl_equiv_mode(acl, &mode); -+ if (ret < 0) -+ return ret; -+ ret = 0; -+ inode->i_mode = mode; -+ } - break; - case ACL_TYPE_DEFAULT: - if (!S_ISDIR(inode->i_mode)) diff --git a/sources b/sources index 12c47b5..ddd5da0 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -dc2f0fab4d67f96e593708ba9158052b patch-2.6.32.18.bz2 -ab86c5cfab95c9fe582de10c43921995 patch-2.6.32.19-rc1.bz2 +e952e24f2bca3e13df9bfec9e082c95c patch-2.6.32.19.bz2