Date: Saturday, April 6, 2013 @ 11:14:10 Author: tpowa Revision: 182062
upgpkg: linux-lts 3.0.72-1 bump to latest version Added: linux-lts/trunk/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch Modified: linux-lts/trunk/PKGBUILD linux-lts/trunk/linux-lts.install ------------------------------------------------------------------+ PKGBUILD | 18 ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch | 187 ++++++++++ linux-lts.install | 2 3 files changed, 200 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-06 09:01:34 UTC (rev 182061) +++ PKGBUILD 2013-04-06 09:14:10 UTC (rev 182062) @@ -5,7 +5,7 @@ pkgbase=linux-lts # Build stock -lts kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.0 -pkgver=3.0.71 +pkgver=3.0.72 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -22,17 +22,19 @@ 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' - 'module-init-wait-3.0.patch') + 'module-init-wait-3.0.patch' + 'ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch') md5sums=('ecf932280e2441bdd992423ef3d55f8f' - '33df614a5ee70e5aa2d39fc8afd16a1d' - 'a8c2f7618f3cc6689e1bea32692b72f5' - '4925d736212481eb1f7b318ef9e8b95f' + 'b8255a58fbdf50cea9a0fa5069e41427' + '8f430189023f071f2be6aa7d3bc747d5' + '879c8a04d02530f902ef3d6d3fc80933' '232b52576a62c7a333e9fe7a1e1ca359' 'f3def2cefdcbb954c21d8505d23cc83c' '263725f20c0b9eb9c353040792d644e5' 'c8299cf750a84e12d60b372c8ca7e1e8' '670931649c60fcb3ef2e0119ed532bd4' - '8a71abc4224f575008f974a099b5cf6f') + '8a71abc4224f575008f974a099b5cf6f' + 'ee587972bbd35841cc0efe82db9caa7c') _kernelname=${pkgbase#linux} @@ -45,6 +47,10 @@ # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # revert i686 build breaker 3.0.72 kernel + if [ "${CARCH}" = "i686" ]; then + patch -Rp1 -i "${srcdir}/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch" + fi # Some chips detect a ghost TV output # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html # Arch Linux bug report: FS#19234 Added: ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch =================================================================== --- ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch (rev 0) +++ ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch 2013-04-06 09:14:10 UTC (rev 182062) @@ -0,0 +1,187 @@ +From 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o <ty...@mit.edu> +Date: Mon, 11 Mar 2013 23:39:59 -0400 +Subject: ext4: use atomic64_t for the per-flexbg free_clusters count + +From: Theodore Ts'o <ty...@mit.edu> + +commit 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 upstream. + +A user who was using a 8TB+ file system and with a very large flexbg +size (> 65536) could cause the atomic_t used in the struct flex_groups +to overflow. This was detected by PaX security patchset: + +http://forums.grsecurity.net/viewtopic.php?f=3&t=3289&p=12551#p12551 + +This bug was introduced in commit 9f24e4208f7e, so it's been around +since 2.6.30. :-( + +Fix this by using an atomic64_t for struct orlav_stats's +free_clusters. + +[Backported for 3.0-stable. Renamed free_clusters back to free_blocks; +fixed a few more atomic_read's of free_blocks left in 3.0.] + +Signed-off-by: "Theodore Ts'o" <ty...@mit.edu> +Reviewed-by: Lukas Czerner <lczer...@redhat.com> +Signed-off-by: Lingzhu Xiang <lxi...@redhat.com> +Reviewed-by: CAI Qian <caiq...@redhat.com> +Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> + +--- a/fs/ext4/ext4.h ++++ b/fs/ext4/ext4.h +@@ -288,9 +288,9 @@ struct ext4_group_desc + */ + + struct flex_groups { +- atomic_t free_inodes; +- atomic_t free_blocks; +- atomic_t used_dirs; ++ atomic64_t free_blocks; ++ atomic_t free_inodes; ++ atomic_t used_dirs; + }; + + #define EXT4_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not in use */ +diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c +index 29272de..dd732c7 100644 +--- a/fs/ext4/ialloc.c ++++ b/fs/ext4/ialloc.c +@@ -345,8 +345,8 @@ static int find_group_flex(struct super_block *sb, struct inode *parent, + ext4_group_t ngroups = ext4_get_groups_count(sb); + int flex_size = ext4_flex_bg_size(sbi); + ext4_group_t best_flex = parent_fbg_group; +- int blocks_per_flex = sbi->s_blocks_per_group * flex_size; +- int flexbg_free_blocks; ++ ext4_fsblk_t blocks_per_flex = sbi->s_blocks_per_group * flex_size; ++ ext4_fsblk_t flexbg_free_blocks; + int flex_freeb_ratio; + ext4_group_t n_fbg_groups; + ext4_group_t i; +@@ -355,7 +355,7 @@ static int find_group_flex(struct super_block *sb, struct inode *parent, + sbi->s_log_groups_per_flex; + + find_close_to_parent: +- flexbg_free_blocks = atomic_read(&flex_group[best_flex].free_blocks); ++ flexbg_free_blocks = atomic64_read(&flex_group[best_flex].free_blocks); + flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex; + if (atomic_read(&flex_group[best_flex].free_inodes) && + flex_freeb_ratio > free_block_ratio) +@@ -370,7 +370,7 @@ find_close_to_parent: + if (i == parent_fbg_group || i == parent_fbg_group - 1) + continue; + +- flexbg_free_blocks = atomic_read(&flex_group[i].free_blocks); ++ flexbg_free_blocks = atomic64_read(&flex_group[i].free_blocks); + flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex; + + if (flex_freeb_ratio > free_block_ratio && +@@ -380,14 +380,14 @@ find_close_to_parent: + } + + if ((atomic_read(&flex_group[best_flex].free_inodes) == 0) || +- ((atomic_read(&flex_group[i].free_blocks) > +- atomic_read(&flex_group[best_flex].free_blocks)) && ++ ((atomic64_read(&flex_group[i].free_blocks) > ++ atomic64_read(&flex_group[best_flex].free_blocks)) && + atomic_read(&flex_group[i].free_inodes))) + best_flex = i; + } + + if (!atomic_read(&flex_group[best_flex].free_inodes) || +- !atomic_read(&flex_group[best_flex].free_blocks)) ++ !atomic64_read(&flex_group[best_flex].free_blocks)) + return -1; + + found_flexbg: +@@ -406,8 +406,8 @@ out: + } + + struct orlov_stats { ++ __u64 free_blocks; + __u32 free_inodes; +- __u32 free_blocks; + __u32 used_dirs; + }; + +@@ -424,7 +424,7 @@ static void get_orlov_stats(struct super_block *sb, ext4_group_t g, + + if (flex_size > 1) { + stats->free_inodes = atomic_read(&flex_group[g].free_inodes); +- stats->free_blocks = atomic_read(&flex_group[g].free_blocks); ++ stats->free_blocks = atomic64_read(&flex_group[g].free_blocks); + stats->used_dirs = atomic_read(&flex_group[g].used_dirs); + return; + } +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index 31bbdb5..35959f6 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -2814,8 +2814,8 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, + ac->ac_b_ex.fe_group); +- atomic_sub(ac->ac_b_ex.fe_len, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_sub(ac->ac_b_ex.fe_len, ++ &sbi->s_flex_groups[flex_group].free_blocks); + } + + err = ext4_handle_dirty_metadata(handle, NULL, bitmap_bh); +@@ -4614,7 +4614,7 @@ do_more: + + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, block_group); +- atomic_add(count, &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(count, &sbi->s_flex_groups[flex_group].free_blocks); + } + + ext4_mb_unload_buddy(&e4b); +@@ -4745,8 +4745,8 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, + + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, block_group); +- atomic_add(blocks_freed, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(blocks_freed, ++ &sbi->s_flex_groups[flex_group].free_blocks); + } + + ext4_mb_unload_buddy(&e4b); +diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c +index 244100f..d2661aac 100644 +--- a/fs/ext4/resize.c ++++ b/fs/ext4/resize.c +@@ -929,8 +929,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) + sbi->s_log_groups_per_flex) { + ext4_group_t flex_group; + flex_group = ext4_flex_group(sbi, input->group); +- atomic_add(input->free_blocks_count, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(input->free_blocks_count, ++ &sbi->s_flex_groups[flex_group].free_blocks); + atomic_add(EXT4_INODES_PER_GROUP(sb), + &sbi->s_flex_groups[flex_group].free_inodes); + } +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index c6a3363..e05cd34 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1992,8 +1992,8 @@ static int ext4_fill_flex_info(struct super_block *sb) + flex_group = ext4_flex_group(sbi, i); + atomic_add(ext4_free_inodes_count(sb, gdp), + &sbi->s_flex_groups[flex_group].free_inodes); +- atomic_add(ext4_free_blks_count(sb, gdp), +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(ext4_free_blks_count(sb, gdp), ++ &sbi->s_flex_groups[flex_group].free_blocks); + atomic_add(ext4_used_dirs_count(sb, gdp), + &sbi->s_flex_groups[flex_group].used_dirs); + } +-- +1.7.11.7 + +-- +To unsubscribe from this list: send the line "unsubscribe stable" in +the body of a message to majord...@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html Modified: linux-lts.install =================================================================== --- linux-lts.install 2013-04-06 09:01:34 UTC (rev 182061) +++ linux-lts.install 2013-04-06 09:14:10 UTC (rev 182062) @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.71-1-lts +KERNEL_VERSION=3.0.72-1-lts # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'