Grsec/PaX: 3.0-{3.2.60,3.14.11,3.15.4}-20140708193720140708

5 files changed, 3 insertions, 73 deletions

diff --git a/3.14.11/0000_README b/3.14.11/0000_README
index 4a9468b..b3b205b 100644
--- a/3.14.11/0000_README
+++ b/3.14.11/0000_README
@@ -2,7 +2,7 @@ README
 -----------------------------------------------------------------------------
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-3.0-3.14.11-201407072045.patch
+Patch:	4420_grsecurity-3.0-3.14.11-201407081919.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.14.11/4420_grsecurity-3.0-3.14.11-201407072045.patch b/3.14.11/4420_grsecurity-3.0-3.14.11-201407081919.patch
index a883f75..fc0ad0c 100644
--- a/3.14.11/4420_grsecurity-3.0-3.14.11-201407072045.patch
+++ b/3.14.11/4420_grsecurity-3.0-3.14.11-201407081919.patch
@@ -46374,18 +46374,6 @@ index cf49c22..971b133 100644
  	struct attribute **attributes;
  	struct sm_sysfs_attribute *vendor_attribute;
  	char *vendor;
-diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index 91ec8cd..562ff5f 100644
---- a/drivers/net/bonding/bond_main.c
-+++ b/drivers/net/bonding/bond_main.c
-@@ -4552,6 +4552,7 @@ static void __exit bonding_exit(void)
- 
- 	bond_netlink_fini();
- 	unregister_pernet_subsys(&bond_net_ops);
-+	rtnl_link_unregister(&bond_link_ops);
- 
- #ifdef CONFIG_NET_POLL_CONTROLLER
- 	/*
 diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
 index 70651f8..7eb1bdf 100644
 --- a/drivers/net/bonding/bond_netlink.c
@@ -46888,18 +46876,6 @@ index 3381c4f..dea5fd5 100644
  	.notifier_call	= macvtap_device_event,
  };
  
-diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
-index daec9b0..6428fcb 100644
---- a/drivers/net/phy/mdio-bitbang.c
-+++ b/drivers/net/phy/mdio-bitbang.c
-@@ -234,6 +234,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/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
 index 72ff14b..11d442d 100644
 --- a/drivers/net/ppp/ppp_generic.c
diff --git a/3.15.4/4420_grsecurity-3.0-3.15.4-201407072046.patch b/3.15.4/4420_grsecurity-3.0-3.15.4-201407081937.patch
index 0dbb183..fbbdd34 100644
--- a/3.15.4/4420_grsecurity-3.0-3.15.4-201407072046.patch
+++ b/3.15.4/4420_grsecurity-3.0-3.15.4-201407081937.patch
@@ -45726,18 +45726,6 @@ index cf49c22..971b133 100644
  	struct attribute **attributes;
  	struct sm_sysfs_attribute *vendor_attribute;
  	char *vendor;
-diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index d3a6789..198ec21 100644
---- a/drivers/net/bonding/bond_main.c
-+++ b/drivers/net/bonding/bond_main.c
-@@ -4504,6 +4504,7 @@ static void __exit bonding_exit(void)
- 
- 	bond_netlink_fini();
- 	unregister_pernet_subsys(&bond_net_ops);
-+	rtnl_link_unregister(&bond_link_ops);
- 
- #ifdef CONFIG_NET_POLL_CONTROLLER
- 	/*
 diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
 index f847e16..fc8dbe9 100644
 --- a/drivers/net/bonding/bond_netlink.c
@@ -46253,18 +46241,6 @@ index 3381c4f..dea5fd5 100644
  	.notifier_call	= macvtap_device_event,
  };
  
-diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
-index daec9b0..6428fcb 100644
---- a/drivers/net/phy/mdio-bitbang.c
-+++ b/drivers/net/phy/mdio-bitbang.c
-@@ -234,6 +234,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/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
 index e3923eb..2a0373b 100644
 --- a/drivers/net/ppp/ppp_generic.c
diff --git a/3.2.60/0000_README b/3.2.60/0000_README
index f6a6bee..86d5902 100644
--- a/3.2.60/0000_README
+++ b/3.2.60/0000_README
@@ -158,7 +158,7 @@ Patch:	1059_linux-3.2.60.patch
 From:	http://www.kernel.org
 Desc:	Linux 3.2.60
 
-Patch:	4420_grsecurity-3.0-3.2.60-201407072042.patch
+Patch:	4420_grsecurity-3.0-3.2.60-201407081916.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.2.60/4420_grsecurity-3.0-3.2.60-201407072042.patch b/3.2.60/4420_grsecurity-3.0-3.2.60-201407081916.patch
index b3267bc..3dc65d9 100644
--- a/3.2.60/4420_grsecurity-3.0-3.2.60-201407072042.patch
+++ b/3.2.60/4420_grsecurity-3.0-3.2.60-201407081916.patch
@@ -43652,7 +43652,7 @@ index a9ff89ff..461d313 100644
  	struct sm_sysfs_attribute *vendor_attribute;
  
 diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index 5af2a8f..9b833b4 100644
+index 5af2a8f..728995b 100644
 --- a/drivers/net/bonding/bond_main.c
 +++ b/drivers/net/bonding/bond_main.c
 @@ -4803,7 +4803,7 @@ static int bond_get_tx_queues(struct net *net, struct nlattr *tb[],
@@ -43664,16 +43664,6 @@ index 5af2a8f..9b833b4 100644
  	.kind		= "bond",
  	.priv_size	= sizeof(struct bonding),
  	.setup		= bond_setup,
-@@ -4929,8 +4929,8 @@ static void __exit bonding_exit(void)
- 
- 	bond_destroy_debugfs();
- 
--	rtnl_link_unregister(&bond_link_ops);
- 	unregister_pernet_subsys(&bond_net_ops);
-+	rtnl_link_unregister(&bond_link_ops);
- 
- #ifdef CONFIG_NET_POLL_CONTROLLER
- 	/*
 diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
 index cf95bd8d..f61f675 100644
 --- a/drivers/net/bonding/bond_sysfs.c
@@ -44387,18 +44377,6 @@ index b0f9015..edcb1f3 100644
  	.notifier_call	= macvtap_device_event,
  };
  
-diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
-index 6539189..09875ce 100644
---- a/drivers/net/phy/mdio-bitbang.c
-+++ b/drivers/net/phy/mdio-bitbang.c
-@@ -225,6 +225,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/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
 index 3ed983c..a1bb418 100644
 --- a/drivers/net/ppp/ppp_generic.c