diff options
Diffstat (limited to 'libre/linux-libre-lts')
-rw-r--r-- | libre/linux-libre-lts/.directory | 3 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 34 | ||||
-rw-r--r-- | libre/linux-libre-lts/change-default-console-loglevel.patch | 2 | ||||
-rw-r--r-- | libre/linux-libre-lts/config.i686 | 2 | ||||
-rw-r--r-- | libre/linux-libre-lts/config.x86_64 | 2 | ||||
-rw-r--r-- | libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch | 187 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 2 |
7 files changed, 210 insertions, 22 deletions
diff --git a/libre/linux-libre-lts/.directory b/libre/linux-libre-lts/.directory deleted file mode 100644 index 3bbc4dedd..000000000 --- a/libre/linux-libre-lts/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2012,8,9,22,54,43 -Version=3 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 4a4972307..bb72f209f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# $Id: PKGBUILD 184141 2013-05-02 15:29:52Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,17 +7,17 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=62 +_sublevel=76 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.61 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.76 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') -makedepends=('xmlto' 'docbook-xsl') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -30,21 +30,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('5f64180fe7df4e574dac5911b78f5067' - '90b2c4b9a05b108219bd44ac4804db84' - '99f9c408b64393aceb2482c9a3e329ee' - 'fba95bf1857ce6bf863e13a1ab73f584' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") +md5sums=('f30a562307b6f71204370fcd33756466' + 'e405de6581d02d44c2c06a81a1d93f93' + 'fe0e9b4415b82f306fc1b63eb9a742a4' + '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' + 'f3def2cefdcbb954c21d8505d23cc83c' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '8436bee363b959651d12eeb21bf0ec23') + '5b330cc23071e1250b7e0a1613a25952') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -54,11 +54,11 @@ fi _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-LTS -build() { +prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo @@ -119,6 +119,10 @@ build() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" # get kernel version make prepare diff --git a/libre/linux-libre-lts/change-default-console-loglevel.patch b/libre/linux-libre-lts/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/libre/linux-libre-lts/change-default-console-loglevel.patch +++ b/libre/linux-libre-lts/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index f903b2114..849fd016b 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -4978,7 +4978,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index c369e1b5b..fe5875138 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -4736,7 +4736,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch b/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch new file mode 100644 index 000000000..be6f7d1e9 --- /dev/null +++ b/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch @@ -0,0 +1,187 @@ +From 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o <tytso@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 <tytso@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" <tytso@mit.edu> +Reviewed-by: Lukas Czerner <lczerner@redhat.com> +Signed-off-by: Lingzhu Xiang <lxiang@redhat.com> +Reviewed-by: CAI Qian <caiqian@redhat.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@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 majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index dc9b9e2d1..d4fbc8398 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.62-1-LIBRE-LTS +KERNEL_VERSION=3.0.76-1-LIBRE-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' |