summaryrefslogtreecommitdiff
path: root/2.6.32
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-05-04 16:06:48 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-05-04 16:06:48 -0400
commit0a1edb909716e16373c79d2ac96decf47790482f (patch)
treee6b6769210b15f78ba2a3c17545467cfc2cf26f3 /2.6.32
parentGrsec/PaX: 2.9.1-{2.6.32.60,3.2.44,3.8.10}-201304271916 (diff)
downloadhardened-patchset-0a1edb909716e16373c79d2ac96decf47790482f.tar.gz
hardened-patchset-0a1edb909716e16373c79d2ac96decf47790482f.tar.bz2
hardened-patchset-0a1edb909716e16373c79d2ac96decf47790482f.zip
Grsec/PaX: 2.9.1-{2.6.32.60,3.2.44,3.8.11}-20130501191720130501
Diffstat (limited to '2.6.32')
-rw-r--r--2.6.32/0000_README2
-rw-r--r--2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304292054.patch (renamed from 2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304262205.patch)22
2 files changed, 16 insertions, 8 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 2b44ed9..3b25af8 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -34,7 +34,7 @@ Patch: 1059_linux-2.6.32.60.patch
From: http://www.kernel.org
Desc: Linux 2.6.32.59
-Patch: 4420_grsecurity-2.9.1-2.6.32.60-201304262205.patch
+Patch: 4420_grsecurity-2.9.1-2.6.32.60-201304292054.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304262205.patch b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304292054.patch
index 2f14145..31c0020 100644
--- a/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304262205.patch
+++ b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304292054.patch
@@ -76580,10 +76580,18 @@ index cb2849f..3718fb4 100644
if (entry->bitmap && entry->bytes > bytes + empty_size) {
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
-index e03a836..323837e 100644
+index e03a836..d4e4e69 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
-@@ -63,7 +63,7 @@ static const struct inode_operations btrfs_file_inode_operations;
+@@ -17,6 +17,7 @@
+ */
+
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/bio.h>
+ #include <linux/buffer_head.h>
+ #include <linux/file.h>
+@@ -63,7 +64,7 @@ static const struct inode_operations btrfs_file_inode_operations;
static const struct address_space_operations btrfs_aops;
static const struct address_space_operations btrfs_symlink_aops;
static const struct file_operations btrfs_dir_file_operations;
@@ -76592,7 +76600,7 @@ index e03a836..323837e 100644
static struct kmem_cache *btrfs_inode_cachep;
struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -925,6 +925,7 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
+@@ -925,6 +926,7 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
1, 0, NULL, GFP_NOFS);
while (start < end) {
async_cow = kmalloc(sizeof(*async_cow), GFP_NOFS);
@@ -76600,7 +76608,7 @@ index e03a836..323837e 100644
async_cow->inode = inode;
async_cow->root = root;
async_cow->locked_page = locked_page;
-@@ -4591,6 +4592,8 @@ static noinline int uncompress_inline(struct btrfs_path *path,
+@@ -4591,6 +4593,8 @@ static noinline int uncompress_inline(struct btrfs_path *path,
inline_size = btrfs_file_extent_inline_item_len(leaf,
btrfs_item_nr(leaf, path->slots[0]));
tmp = kmalloc(inline_size, GFP_NOFS);
@@ -76609,7 +76617,7 @@ index e03a836..323837e 100644
ptr = btrfs_file_extent_inline_start(item);
read_extent_buffer(leaf, tmp, ptr, inline_size);
-@@ -5410,7 +5413,7 @@ fail:
+@@ -5410,7 +5414,7 @@ fail:
return -ENOMEM;
}
@@ -76618,7 +76626,7 @@ index e03a836..323837e 100644
struct dentry *dentry, struct kstat *stat)
{
struct inode *inode = dentry->d_inode;
-@@ -5422,6 +5425,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
+@@ -5422,6 +5426,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
return 0;
}
@@ -76633,7 +76641,7 @@ index e03a836..323837e 100644
static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry)
{
-@@ -5972,7 +5983,7 @@ static const struct file_operations btrfs_dir_file_operations = {
+@@ -5972,7 +5984,7 @@ static const struct file_operations btrfs_dir_file_operations = {
.fsync = btrfs_sync_file,
};