summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-03-31 07:45:54 -0400
committerAnthony G. Basile <blueness@gentoo.org>2014-03-31 07:45:54 -0400
commita49eb5964e6e872990046c2eff55ba3c466d3f9c (patch)
tree86dc37922221e95dd2484f8b154d74ab2244c0fc
parent2.6.32: EOF both kernel and grsec upstream (diff)
downloadhardened-patchset-a49eb5964e6e872990046c2eff55ba3c466d3f9c.tar.gz
hardened-patchset-a49eb5964e6e872990046c2eff55ba3c466d3f9c.tar.bz2
hardened-patchset-a49eb5964e6e872990046c2eff55ba3c466d3f9c.zip
Grsec/PaX: 3.0-3.2.55-20140330085120140330
-rw-r--r--3.2.55/0000_README2
-rw-r--r--3.2.55/4420_grsecurity-3.0-3.2.55-201403300851.patch (renamed from 3.2.55/4420_grsecurity-3.0-3.2.55-201403281858.patch)28
2 files changed, 1 insertions, 29 deletions
diff --git a/3.2.55/0000_README b/3.2.55/0000_README
index 89a0c5a..d6fed9e 100644
--- a/3.2.55/0000_README
+++ b/3.2.55/0000_README
@@ -138,7 +138,7 @@ Patch: 1054_linux-3.2.55.patch
From: http://www.kernel.org
Desc: Linux 3.2.55
-Patch: 4420_grsecurity-3.0-3.2.55-201403281858.patch
+Patch: 4420_grsecurity-3.0-3.2.55-201403300851.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/3.2.55/4420_grsecurity-3.0-3.2.55-201403281858.patch b/3.2.55/4420_grsecurity-3.0-3.2.55-201403300851.patch
index aabac92..73a3dcc 100644
--- a/3.2.55/4420_grsecurity-3.0-3.2.55-201403281858.patch
+++ b/3.2.55/4420_grsecurity-3.0-3.2.55-201403300851.patch
@@ -53057,34 +53057,6 @@ index 8cdd8ea..64197b4 100644
kiocb->ki_nr_segs = kiocb->ki_nbytes;
kiocb->ki_cur_seg = 0;
/* ki_nbytes/left now reflect bytes instead of segs */
-diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c
-index f11e43e..544bdd2 100644
---- a/fs/anon_inodes.c
-+++ b/fs/anon_inodes.c
-@@ -216,13 +216,10 @@ static int __init anon_inode_init(void)
- {
- int error;
-
-- error = register_filesystem(&anon_inode_fs_type);
-- if (error)
-- goto err_exit;
- anon_inode_mnt = kern_mount(&anon_inode_fs_type);
- if (IS_ERR(anon_inode_mnt)) {
- error = PTR_ERR(anon_inode_mnt);
-- goto err_unregister_filesystem;
-+ goto err_exit;
- }
- anon_inode_inode = anon_inode_mkinode();
- if (IS_ERR(anon_inode_inode)) {
-@@ -234,8 +231,6 @@ static int __init anon_inode_init(void)
-
- err_mntput:
- kern_unmount(anon_inode_mnt);
--err_unregister_filesystem:
-- unregister_filesystem(&anon_inode_fs_type);
- err_exit:
- panic(KERN_ERR "anon_inode_init() failed (%d)\n", error);
- }
diff --git a/fs/attr.c b/fs/attr.c
index b8f55c4..4c2b80c 100644
--- a/fs/attr.c