Grsec/PaX: 2.9.1-{2.6.32.60,3.2.33,3.6.5}-201211042157

2 files changed, 64 insertions, 5 deletions

diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 77cac16..bbe4567 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-201210310820.patch
+Patch:	4420_grsecurity-2.9.1-2.6.32.60-201211042106.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-201210310820.patch b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201211042106.patch
index 04f2458..e2f2160 100644
--- a/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201210310820.patch
+++ b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201211042106.patch
@@ -43049,10 +43049,36 @@ index 9908c9e..3ceb0e5 100644
  static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx)
  {
 diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
-index 85c464a..afd1e73 100644
+index 85c464a..378a72b 100644
 --- a/drivers/edac/amd64_edac.c
 +++ b/drivers/edac/amd64_edac.c
-@@ -3099,7 +3099,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
+@@ -106,8 +106,11 @@ static int amd64_search_set_scrub_rate(struct pci_dev *ctl, u32 new_bw,
+ 	 * memory controller and apply to register. Search for the first
+ 	 * bandwidth entry that is greater or equal than the setting requested
+ 	 * and program that. If at last entry, turn off DRAM scrubbing.
++	 *
++	 * If no suitable bandwidth is found, turn off DRAM scrubbing entirely
++	 * by falling back to the last element in scrubrates[].
+ 	 */
+-	for (i = 0; i < ARRAY_SIZE(scrubrates); i++) {
++	for (i = 0; i < ARRAY_SIZE(scrubrates) - 1; i++) {
+ 		/*
+ 		 * skip scrub rates which aren't recommended
+ 		 * (see F10 BKDG, F3x58)
+@@ -117,12 +120,6 @@ static int amd64_search_set_scrub_rate(struct pci_dev *ctl, u32 new_bw,
+ 
+ 		if (scrubrates[i].bandwidth <= new_bw)
+ 			break;
+-
+-		/*
+-		 * if no suitable bandwidth found, turn off DRAM scrubbing
+-		 * entirely by falling back to the last element in the
+-		 * scrubrates array.
+-		 */
+ 	}
+ 
+ 	scrubval = scrubrates[i].scrubval;
+@@ -3099,7 +3096,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
   * PCI core identifies what devices are on a system during boot, and then
   * inquiry this table to see if this driver is for a given device found.
   */
@@ -45378,7 +45404,7 @@ index 51aa745..146ee60 100644
  	.init_chipset	= init_chipset_it821x,
  	.init_hwif	= init_hwif_it821x,
 diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
-index bf2be64..9270098 100644
+index bf2be643..9270098 100644
 --- a/drivers/ide/jmicron.c
 +++ b/drivers/ide/jmicron.c
 @@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
@@ -62623,6 +62649,18 @@ index c1b3f09..97cd8c4 100644
  			}
  		} else {
  			if (netif_msg_link(lp))
+diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
+index 2576055..4b8b7d3 100644
+--- a/drivers/net/phy/mdio-bitbang.c
++++ b/drivers/net/phy/mdio-bitbang.c
+@@ -184,6 +184,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
+ 	struct mdiobb_ctrl *ctrl = bus->priv;
+ 
+ 	module_put(ctrl->ops->owner);
++	mdiobus_unregister(bus);
+ 	mdiobus_free(bus);
+ }
+ EXPORT_SYMBOL(free_mdio_bitbang);
 diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
 index 9235901..d31e726 100644
 --- a/drivers/net/pppol2tp.c
@@ -79596,7 +79634,7 @@ index 170d289..3254b98 100644
  	mydstlen = *dstlen - 8;
  
 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
-index b47679b..00d65d3 100644
+index b47679b..00d65d36 100644
 --- a/fs/jffs2/erase.c
 +++ b/fs/jffs2/erase.c
 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
@@ -112001,6 +112039,27 @@ index b9644d8..537313b 100644
  	if (get_user(len, optlen))
  		return -EFAULT;
  
+diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
+index 1eba160..c35d91f 100644
+--- a/net/ipv4/tcp_illinois.c
++++ b/net/ipv4/tcp_illinois.c
+@@ -313,11 +313,13 @@ static void tcp_illinois_info(struct sock *sk, u32 ext,
+ 			.tcpv_rttcnt = ca->cnt_rtt,
+ 			.tcpv_minrtt = ca->base_rtt,
+ 		};
+-		u64 t = ca->sum_rtt;
+ 
+-		do_div(t, ca->cnt_rtt);
+-		info.tcpv_rtt = t;
++		if (info.tcpv_rttcnt > 0) {
++			u64 t = ca->sum_rtt;
+ 
++			do_div(t, info.tcpv_rttcnt);
++			info.tcpv_rtt = t;
++		}
+ 		nla_put(skb, INET_DIAG_VEGASINFO, sizeof(info), &info);
+ 	}
+ }
 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
 index db755c4..04481e4 100644
 --- a/net/ipv4/tcp_input.c