grsecurity-3.1-4.2.4-20151024090720151024

2 files changed, 39 insertions, 11 deletions

diff --git a/4.2.4/0000_README b/4.2.4/0000_README
index a7f6aae..ddc5a83 100644
--- a/4.2.4/0000_README
+++ b/4.2.4/0000_README
@@ -6,7 +6,7 @@ Patch:	1003_linux-4.2.4.patch
 From:	http://www.kernel.org
 Desc:	Linux 4.2.4
 
-Patch:	4420_grsecurity-3.1-4.2.4-201510222059.patch
+Patch:	4420_grsecurity-3.1-4.2.4-201510240907.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/4.2.4/4420_grsecurity-3.1-4.2.4-201510222059.patch b/4.2.4/4420_grsecurity-3.1-4.2.4-201510240907.patch
index c3d3682..c6e64ba 100644
--- a/4.2.4/4420_grsecurity-3.1-4.2.4-201510222059.patch
+++ b/4.2.4/4420_grsecurity-3.1-4.2.4-201510240907.patch
@@ -57404,6 +57404,19 @@ index db322d9..f0f4bc1 100644
  
  	if (!left--) {
  		if (instance->disconnected)
+diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
+index dd9af38..75b53e3 100644
+--- a/drivers/usb/class/cdc-acm.h
++++ b/drivers/usb/class/cdc-acm.h
+@@ -95,7 +95,7 @@ struct acm {
+ 	struct urb *read_urbs[ACM_NR];
+ 	struct acm_rb read_buffers[ACM_NR];
+ 	int rx_buflimit;
+-	int rx_endpoint;
++	unsigned int rx_endpoint;
+ 	spinlock_t read_lock;
+ 	int write_used;					/* number of non-empty write buffers */
+ 	int transmitting;
 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
 index 2a3bbdf..91d72cf 100644
 --- a/drivers/usb/core/devices.c
@@ -102375,7 +102388,7 @@ index 99c1b4d..562e6f3 100644
  
  static inline void put_unaligned_le16(u16 val, void *p)
 diff --git a/include/linux/usb.h b/include/linux/usb.h
-index 447fe29..fc8bf1e 100644
+index 447fe29..07a9cf0 100644
 --- a/include/linux/usb.h
 +++ b/include/linux/usb.h
 @@ -363,7 +363,7 @@ struct usb_bus {
@@ -102396,6 +102409,21 @@ index 447fe29..fc8bf1e 100644
  
  	unsigned long active_duration;
  
+@@ -1785,10 +1785,10 @@ void usb_sg_wait(struct usb_sg_request *io);
+ 
+ /* NOTE:  these are not the standard USB_ENDPOINT_XFER_* values!! */
+ /* (yet ... they're the values used by usbfs) */
+-#define PIPE_ISOCHRONOUS		0
+-#define PIPE_INTERRUPT			1
+-#define PIPE_CONTROL			2
+-#define PIPE_BULK			3
++#define PIPE_ISOCHRONOUS		0U
++#define PIPE_INTERRUPT			1U
++#define PIPE_CONTROL			2U
++#define PIPE_BULK			3U
+ 
+ #define usb_pipein(pipe)	((pipe) & USB_DIR_IN)
+ #define usb_pipeout(pipe)	(!usb_pipein(pipe))
 diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
 index c9aa779..46d6f69 100644
 --- a/include/linux/usb/hcd.h
@@ -131705,10 +131733,10 @@ index 0000000..4c7f7c6
 +targets += size_overflow_hash.h size_overflow_hash_aux.h disable_size_overflow_hash.h
 diff --git a/tools/gcc/size_overflow_plugin/disable_size_overflow_hash.data b/tools/gcc/size_overflow_plugin/disable_size_overflow_hash.data
 new file mode 100644
-index 0000000..3baef37
+index 0000000..a9f4b69
 --- /dev/null
 +++ b/tools/gcc/size_overflow_plugin/disable_size_overflow_hash.data
-@@ -0,0 +1,12398 @@
+@@ -0,0 +1,12401 @@
 +disable_so_interrupt_pnode_gru_message_queue_desc_4 interrupt_pnode gru_message_queue_desc 0 4 NULL
 +disable_so_bch_btree_insert_fndecl_12 bch_btree_insert fndecl 0 12 NULL
 +disable_so_macvlan_sync_address_fndecl_22 macvlan_sync_address fndecl 0 22 NULL nohasharray
@@ -137755,7 +137783,8 @@ index 0000000..3baef37
 +disable_so_tfmsize_crypto_type_32129 tfmsize crypto_type 0 32129 &disable_so_prandom_bytes_fndecl_32129
 +disable_so_freq_ar9170_calibration_target_power_legacy_32133 freq ar9170_calibration_target_power_legacy 0 32133 NULL nohasharray
 +disable_so_addr_buffer_state_32133 addr buffer_state 0 32133 &disable_so_freq_ar9170_calibration_target_power_legacy_32133
-+disable_so_btree_invalidatepage_fndecl_32134 btree_invalidatepage fndecl 2 32134 NULL
++enable_so_max_rate_idx_ieee80211_tx_rate_control_32134 max_rate_idx ieee80211_tx_rate_control 0 32134 NULL nohasharray
++disable_so_btree_invalidatepage_fndecl_32134 btree_invalidatepage fndecl 2 32134 &enable_so_max_rate_idx_ieee80211_tx_rate_control_32134
 +disable_so_hfs_bnode_findhash_fndecl_32138 hfs_bnode_findhash fndecl 2 32138 NULL
 +disable_so_symhash_fndecl_32144 symhash fndecl 0 32144 NULL
 +disable_so_ahc_print_register_fndecl_32148 ahc_print_register fndecl 5 32148 NULL
@@ -144107,6 +144136,8 @@ index 0000000..3baef37
 +enable_so_rts_threshold_wiphy_15170 rts_threshold wiphy 0 15170 NULL
 +enable_so_value_iw_param_65472 value iw_param 0 65472 NULL
 +enable_so_value_acpi_object_integer_44755 value acpi_object_integer 0 44755 NULL
++enable_so_idx_ieee80211_tx_rate_64646 idx ieee80211_tx_rate 0 64646 NULL
++enable_so_rs_get_adjacent_rate_fndecl_28334 rs_get_adjacent_rate fndecl 0-2 28334 NULL
 diff --git a/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
 new file mode 100644
 index 0000000..be9724d
@@ -146258,10 +146289,10 @@ index 0000000..ab2d25a
 +}
 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash.data b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
 new file mode 100644
-index 0000000..d372a51
+index 0000000..efb5acd
 --- /dev/null
 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
-@@ -0,0 +1,20759 @@
+@@ -0,0 +1,20756 @@
 +enable_so_recv_ctrl_pipe_us_data_0 recv_ctrl_pipe us_data 0 0 NULL
 +enable_so___earlyonly_bootmem_alloc_fndecl_3 __earlyonly_bootmem_alloc fndecl 2-3-4 3 NULL
 +enable_so_size_ttm_mem_reg_8 size ttm_mem_reg 0 8 NULL
@@ -155221,8 +155252,7 @@ index 0000000..d372a51
 +enable_so_raw_descs_length_ffs_data_28328 raw_descs_length ffs_data 0 28328 &enable_so__iwl_dbgfs_disable_power_off_write_fndecl_28328
 +enable_so_max_segment_size_brcmf_sdio_dev_28330 max_segment_size brcmf_sdio_dev 0 28330 NULL nohasharray
 +enable_so_size_videobuf_dmabuf_28330 size videobuf_dmabuf 0 28330 &enable_so_max_segment_size_brcmf_sdio_dev_28330
-+enable_so_rs_get_adjacent_rate_fndecl_28334 rs_get_adjacent_rate fndecl 0-2 28334 NULL nohasharray
-+enable_so_asix_read_cmd_fndecl_28334 asix_read_cmd fndecl 5 28334 &enable_so_rs_get_adjacent_rate_fndecl_28334
++enable_so_asix_read_cmd_fndecl_28334 asix_read_cmd fndecl 5 28334 NULL
 +enable_so_mwifiex_debug_mask_read_fndecl_28341 mwifiex_debug_mask_read fndecl 3 28341 NULL
 +enable_so_ie_length_ndis_80211_bssid_ex_28346 ie_length ndis_80211_bssid_ex 0 28346 NULL
 +enable_so_plcp_mimo2_il_rate_info_28347 plcp_mimo2 il_rate_info 0 28347 NULL
@@ -156427,7 +156457,6 @@ index 0000000..d372a51
 +enable_so_first_slot_vardecl_cpcihp_generic_c_32129 first_slot vardecl_cpcihp_generic.c 0 32129 &enable_so_ip6_make_skb_fndecl_32129
 +enable_so_lpfc_debugfs_max_slow_ring_trc_vardecl_lpfc_debugfs_c_32130 lpfc_debugfs_max_slow_ring_trc vardecl_lpfc_debugfs.c 0 32130 NULL
 +enable_so_sb_gquotino_xfs_sb_32131 sb_gquotino xfs_sb 0 32131 NULL
-+enable_so_max_rate_idx_ieee80211_tx_rate_control_32134 max_rate_idx ieee80211_tx_rate_control 0 32134 NULL
 +enable_so_sync_request_fndecl_32141 sync_request fndecl 2 32141 NULL nohasharray
 +enable_so_fsector_t_vardecl_floppy_c_32141 fsector_t vardecl_floppy.c 0 32141 &enable_so_sync_request_fndecl_32141
 +enable_so_prof_shift_vardecl_profile_c_32143 prof_shift vardecl_profile.c 0 32143 NULL
@@ -166728,7 +166757,6 @@ index 0000000..d372a51
 +enable_so_s_inodes_per_group_ext3_sb_info_64627 s_inodes_per_group ext3_sb_info 0 64627 NULL
 +enable_so_objio_alloc_io_state_fndecl_64631 objio_alloc_io_state fndecl 6-7 64631 NULL
 +enable_so_bsg_job_done_fndecl_64640 bsg_job_done fndecl 3 64640 NULL
-+enable_so_idx_ieee80211_tx_rate_64646 idx ieee80211_tx_rate 0 64646 NULL
 +enable_so_netlink_alloc_large_skb_fndecl_64652 netlink_alloc_large_skb fndecl 1 64652 NULL
 +enable_so_kmp_init_fndecl_64654 kmp_init fndecl 2 64654 NULL
 +enable_so_num_allowed_vlans_qlcnic_sriov_64661 num_allowed_vlans qlcnic_sriov 0 64661 NULL