Grsec/PaX: 2.9.1-{2.6.32.59,3.2.23,3.4.5}-20120717162420120717

4 files changed, 6 insertions, 22 deletions

diff --git a/3.2.23/0000_README b/3.2.23/0000_README
index 9f100ed..31ce6b5 100644
--- a/3.2.23/0000_README
+++ b/3.2.23/0000_README
@@ -10,7 +10,7 @@ Patch:	1022_linux-3.2.23.patch
 From:	http://www.kernel.org
 Desc:	Linux 3.2.23
 
-Patch:	4420_grsecurity-2.9.1-3.2.23-201207161806.patch
+Patch:	4420_grsecurity-2.9.1-3.2.23-201207171624.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.2.23/4420_grsecurity-2.9.1-3.2.23-201207161806.patch b/3.2.23/4420_grsecurity-2.9.1-3.2.23-201207171624.patch
index 7e92b92..7aba0a9 100644
--- a/3.2.23/4420_grsecurity-2.9.1-3.2.23-201207161806.patch
+++ b/3.2.23/4420_grsecurity-2.9.1-3.2.23-201207171624.patch
@@ -71245,7 +71245,7 @@ index d53adf9..03a24bf 100644
  	set_fs(old_fs);
  
 diff --git a/mm/madvise.c b/mm/madvise.c
-index 23d3a6b..7b519b7 100644
+index 23d3a6b..e10d35a 100644
 --- a/mm/madvise.c
 +++ b/mm/madvise.c
 @@ -46,6 +46,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
@@ -71307,15 +71307,7 @@ index 23d3a6b..7b519b7 100644
  	return 0;
  }
  
-@@ -232,6 +263,7 @@ static long madvise_remove(struct vm_area_struct *vma,
- 	error = vmtruncate_range(mapping->host, offset, endoff);
- 	fput(f);
- 	down_read(&current->mm->mmap_sem);
-+	fput(f);
- 	return error;
- }
- 
-@@ -386,6 +418,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
+@@ -386,6 +417,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
  	if (end < start)
  		goto out;
  
diff --git a/3.4.5/0000_README b/3.4.5/0000_README
index eaa4858..41e086b 100644
--- a/3.4.5/0000_README
+++ b/3.4.5/0000_README
@@ -2,7 +2,7 @@ README
 -----------------------------------------------------------------------------
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.9.1-3.4.5-201207161807.patch
+Patch:	4420_grsecurity-2.9.1-3.4.5-201207171624.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.4.5/4420_grsecurity-2.9.1-3.4.5-201207161807.patch b/3.4.5/4420_grsecurity-2.9.1-3.4.5-201207171624.patch
index 43c8a0f..a842b50 100644
--- a/3.4.5/4420_grsecurity-2.9.1-3.4.5-201207161807.patch
+++ b/3.4.5/4420_grsecurity-2.9.1-3.4.5-201207171624.patch
@@ -69669,7 +69669,7 @@ index d53adf9..03a24bf 100644
  	set_fs(old_fs);
  
 diff --git a/mm/madvise.c b/mm/madvise.c
-index 55f645c..4f3fd75 100644
+index 55f645c..cde5320 100644
 --- a/mm/madvise.c
 +++ b/mm/madvise.c
 @@ -46,6 +46,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
@@ -69731,15 +69731,7 @@ index 55f645c..4f3fd75 100644
  	return 0;
  }
  
-@@ -238,6 +269,7 @@ static long madvise_remove(struct vm_area_struct *vma,
- 	error = vmtruncate_range(mapping->host, offset, endoff);
- 	fput(f);
- 	down_read(&current->mm->mmap_sem);
-+	fput(f);
- 	return error;
- }
- 
-@@ -394,6 +426,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
+@@ -394,6 +425,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
  	if (end < start)
  		goto out;