Grsec/PaX: 3.1-{3.2.68,3.14.36,3.19.2}-20150325180720150325

6 files changed, 6 insertions, 83 deletions

diff --git a/3.14.36/0000_README b/3.14.36/0000_README
index ea2152e..8f98f5b 100644
--- a/3.14.36/0000_README
+++ b/3.14.36/0000_README
@@ -2,7 +2,7 @@ README
 -----------------------------------------------------------------------------
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-3.1-3.14.36-201503182218.patch
+Patch:	4420_grsecurity-3.1-3.14.36-201503251807.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.14.36/4420_grsecurity-3.1-3.14.36-201503182218.patch b/3.14.36/4420_grsecurity-3.1-3.14.36-201503251807.patch
index 28c0f41..90768c5 100644
--- a/3.14.36/4420_grsecurity-3.1-3.14.36-201503182218.patch
+++ b/3.14.36/4420_grsecurity-3.1-3.14.36-201503251807.patch
@@ -59758,34 +59758,6 @@ index f70119f..ab5894d 100644
  	delayed_root->nodes = 0;
  	spin_lock_init(&delayed_root->lock);
  	init_waitqueue_head(&delayed_root->wait);
-diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 0b72006..264c7de 100644
---- a/fs/btrfs/ioctl.c
-+++ b/fs/btrfs/ioctl.c
-@@ -3494,9 +3494,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
- 	for (i = 0; i < num_types; i++) {
- 		struct btrfs_space_info *tmp;
- 
-+		/* Don't copy in more than we allocated */
- 		if (!slot_count)
- 			break;
- 
-+		slot_count--;
-+
- 		info = NULL;
- 		rcu_read_lock();
- 		list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -3518,10 +3521,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
- 				memcpy(dest, &space, sizeof(space));
- 				dest++;
- 				space_args.total_spaces++;
--				slot_count--;
- 			}
--			if (!slot_count)
--				break;
- 		}
- 		up_read(&info->groups_sem);
- 	}
 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
 index d04db81..96e54f1 100644
 --- a/fs/btrfs/super.c
diff --git a/3.19.2/0000_README b/3.19.2/0000_README
index 91abd27..6d7f956 100644
--- a/3.19.2/0000_README
+++ b/3.19.2/0000_README
@@ -2,7 +2,7 @@ README
 -----------------------------------------------------------------------------
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-3.1-3.19.2-201503201903.patch
+Patch:	4420_grsecurity-3.1-3.19.2-201503251807.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.19.2/4420_grsecurity-3.1-3.19.2-201503201903.patch b/3.19.2/4420_grsecurity-3.1-3.19.2-201503251807.patch
index 585a368..e0eac06 100644
--- a/3.19.2/4420_grsecurity-3.1-3.19.2-201503201903.patch
+++ b/3.19.2/4420_grsecurity-3.1-3.19.2-201503251807.patch
@@ -59200,34 +59200,6 @@ index f70119f..ab5894d 100644
  	delayed_root->nodes = 0;
  	spin_lock_init(&delayed_root->lock);
  	init_waitqueue_head(&delayed_root->wait);
-diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index d49fe8a..2e11037 100644
---- a/fs/btrfs/ioctl.c
-+++ b/fs/btrfs/ioctl.c
-@@ -3925,9 +3925,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
- 	for (i = 0; i < num_types; i++) {
- 		struct btrfs_space_info *tmp;
- 
-+		/* Don't copy in more than we allocated */
- 		if (!slot_count)
- 			break;
- 
-+		slot_count--;
-+
- 		info = NULL;
- 		rcu_read_lock();
- 		list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -3949,10 +3952,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
- 				memcpy(dest, &space, sizeof(space));
- 				dest++;
- 				space_args.total_spaces++;
--				slot_count--;
- 			}
--			if (!slot_count)
--				break;
- 		}
- 		up_read(&info->groups_sem);
- 	}
 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
 index 6f49b28..483410f 100644
 --- a/fs/btrfs/super.c
diff --git a/3.2.68/0000_README b/3.2.68/0000_README
index 78cb951..238a9f1 100644
--- a/3.2.68/0000_README
+++ b/3.2.68/0000_README
@@ -190,7 +190,7 @@ Patch:	1067_linux-3.2.68.patch
 From:	http://www.kernel.org
 Desc:	Linux 3.2.68
 
-Patch:	4420_grsecurity-3.1-3.2.68-201503182213.patch
+Patch:	4420_grsecurity-3.1-3.2.68-201503251805.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.2.68/4420_grsecurity-3.1-3.2.68-201503182213.patch b/3.2.68/4420_grsecurity-3.1-3.2.68-201503251805.patch
index ae778bb..9c4d314 100644
--- a/3.2.68/4420_grsecurity-3.1-3.2.68-201503182213.patch
+++ b/3.2.68/4420_grsecurity-3.1-3.2.68-201503251805.patch
@@ -6953,7 +6953,7 @@ index 03f2b55..b0270327 100644
  };
  
 diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
-index 325f98b..6fdc4f7 100644
+index 325f98b17..6fdc4f7 100644
 --- a/arch/sh/kernel/process.c
 +++ b/arch/sh/kernel/process.c
 @@ -54,7 +54,7 @@ void free_thread_info(struct thread_info *ti)
@@ -57679,31 +57679,10 @@ index a694317..dc698a1 100644
  		do_chunk_alloc(trans, root->fs_info->extent_root,
  			       num_bytes, data, CHUNK_ALLOC_FORCE);
 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 7cbe2f8..2e2ed72 100644
+index 7cbe2f8..20cc43f 100644
 --- a/fs/btrfs/ioctl.c
 +++ b/fs/btrfs/ioctl.c
-@@ -2738,9 +2738,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
- 	for (i = 0; i < num_types; i++) {
- 		struct btrfs_space_info *tmp;
- 
-+		/* Don't copy in more than we allocated */
- 		if (!slot_count)
- 			break;
- 
-+		slot_count--;
-+
- 		info = NULL;
- 		rcu_read_lock();
- 		list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -2762,15 +2765,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
- 				memcpy(dest, &space, sizeof(space));
- 				dest++;
- 				space_args.total_spaces++;
--				slot_count--;
- 			}
--			if (!slot_count)
--				break;
- 		}
+@@ -2770,7 +2770,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
  		up_read(&info->groups_sem);
  	}