Date: Sunday, November 29, 2015 @ 16:46:55 Author: thestinger Revision: 147921
upgpkg: linux-grsec 4.2.6.201511282239-1 Added: linux-grsec/trunk/btrfs-overflow.patch Modified: linux-grsec/trunk/PKGBUILD ----------------------+ PKGBUILD | 8 ++++++-- btrfs-overflow.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-11-29 15:46:13 UTC (rev 147920) +++ PKGBUILD 2015-11-29 15:46:55 UTC (rev 147921) @@ -9,7 +9,7 @@ _srcname=linux-4.2 _pkgver=4.2.6 _grsecver=3.1 -_timestamp=201511232037 +_timestamp=201511282239 _grsec_patch="grsecurity-$_grsecver-$_pkgver-$_timestamp.patch" pkgver=$_pkgver.$_timestamp pkgrel=1 @@ -29,6 +29,7 @@ # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' + 'btrfs-overflow.patch' '0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch' '0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch') @@ -36,12 +37,13 @@ 'SKIP' '419f91fa4a6bb0d2c160ef6812341e5aac7e776550efe1d0958ae3b1ce0ea8ce' 'SKIP' - '28bf457d638de8d308bd1bba7871b59103a2392809b3457e90fb5670f4c7af8c' + 'd6b1b5d637405037483cc6949815d01936a9afe7c0cb05db80d5fa2e6a5a99c4' 'SKIP' '2b83adabea3b0d0d70c257e041018b4024b1b7040c883b4ef2ef456acbc3d7e2' 'ff22c57ead579fbc10f80cb36a962bb2ae2ae230813a889649259d29cc96bf42' 'ca7e718375b3790888756cc0a64a7500cd57dddb9bf7e10a0df22c860d91f74d' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '82efb1d533b579e8ea6103456e76ace1f749c9f055b0eaf95b980dc9ae544e5f' '0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b' '6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3') validpgpkeys=( @@ -66,6 +68,8 @@ # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + patch -p1 -i "$srcdir/btrfs-overflow.patch" + # Add grsecurity patches patch -Np1 -i "$srcdir/$_grsec_patch" rm localversion-grsec Added: btrfs-overflow.patch =================================================================== --- btrfs-overflow.patch (rev 0) +++ btrfs-overflow.patch 2015-11-29 15:46:55 UTC (rev 147921) @@ -0,0 +1,26 @@ +diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c +index 6a98bdd..fed3da6 100644 +--- a/fs/btrfs/extent_map.c ++++ b/fs/btrfs/extent_map.c +@@ -235,7 +235,9 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em) + em->start = merge->start; + em->orig_start = merge->orig_start; + em->len += merge->len; +- em->block_len += merge->block_len; ++ if (em->block_start != EXTENT_MAP_HOLE && ++ em->block_start != EXTENT_MAP_INLINE) ++ em->block_len += merge->block_len; + em->block_start = merge->block_start; + em->mod_len = (em->mod_len + em->mod_start) - merge->mod_start; + em->mod_start = merge->mod_start; +@@ -252,7 +254,9 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em) + merge = rb_entry(rb, struct extent_map, rb_node); + if (rb && mergable_maps(em, merge)) { + em->len += merge->len; +- em->block_len += merge->block_len; ++ if (em->block_start != EXTENT_MAP_HOLE && ++ em->block_start != EXTENT_MAP_INLINE) ++ em->block_len += merge->block_len; + rb_erase(&merge->rb_node, &tree->map); + RB_CLEAR_NODE(&merge->rb_node); + em->mod_len = (merge->mod_start + merge->mod_len) - em->mod_start;