main/linux-grsec: upgrade to 3.6.6 kernel

2 files changed, 75 insertions, 84 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 85f40da36c..f05e610a03 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=grsec
 pkgname=linux-${_flavor}
-pkgver=3.6.5
+pkgver=3.6.6
 _kernver=3.6
 pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH}}
 install=
 source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
         http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
-        grsecurity-2.9.1-3.6.5-201211042157.patch
+        grsecurity-2.9.1-3.6.6-201211051957.patch
         
         0004-arp-flush-arp-cache-on-device-change.patch
 
@@ -139,8 +139,8 @@ dev() {
 }
 
 md5sums="1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-6ad8ceebb9b5c1bf69a0c07ef7cc81f2  patch-3.6.5.xz
-0affb0d4559c04d76251be6755338ae1  grsecurity-2.9.1-3.6.5-201211042157.patch
+11d6d8749d4612a77f43f0531c0f2824  patch-3.6.6.xz
+562292d1cfaca88f4a78e15779fdb3e6  grsecurity-2.9.1-3.6.6-201211051957.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
 0fe70e3640b55adb6800e6eebe74ea4d  kernelconfig.x86
 b7707e701f190d97c3552b7ec292b897  kernelconfig.x86_64"
diff --git a/main/linux-grsec/grsecurity-2.9.1-3.6.5-201211042157.patch b/main/linux-grsec/grsecurity-2.9.1-3.6.6-201211051957.patch
index 18206e5084..b18fa6094f 100644
--- a/main/linux-grsec/grsecurity-2.9.1-3.6.5-201211042157.patch
+++ b/main/linux-grsec/grsecurity-2.9.1-3.6.6-201211051957.patch
@@ -251,7 +251,7 @@ index ad7e2e5..199f49e 100644
  
         pcd.            [PARIDE]
 diff --git a/Makefile b/Makefile
-index 6e4a00d..4c7aa4f 100644
+index 471b83c..a290aa2 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -1849,6 +1849,23 @@ index 677357f..8828dda 100644
         .late_init = n8x0_menelaus_late_init,
  };
  
+diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
+index 37afbd1..c22ad7c 100644
+--- a/arch/arm/mach-omap2/omap_hwmod.c
++++ b/arch/arm/mach-omap2/omap_hwmod.c
+@@ -187,10 +187,10 @@ struct omap_hwmod_soc_ops {
+        int (*is_hardreset_asserted)(struct omap_hwmod *oh,
+                                     struct omap_hwmod_rst_info *ohri);
+        int (*init_clkdm)(struct omap_hwmod *oh);
+-};
++} __no_const;
+ 
+ /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
+-static struct omap_hwmod_soc_ops soc_ops;
++static struct omap_hwmod_soc_ops soc_ops __read_only;
+ 
+ /* omap_hwmod_list contains all registered struct omap_hwmods */
+ static LIST_HEAD(omap_hwmod_list);
 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
 index c3bd834..e81ef02 100644
 --- a/arch/arm/mm/fault.c
@@ -30983,10 +31000,10 @@ index af7cfb8..aadc2a3 100644
         if (++trycnt > 100000) {
                 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
-index c610144..97440e2 100644
+index f5e9584..05934ba 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_state.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -490,7 +490,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -492,7 +492,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
         bool can_switch;
  
         spin_lock(&dev->count_lock);
@@ -33781,7 +33798,7 @@ index 1cbfc6b..56e1dbb 100644
  /*----------------------------------------------------------------*/
  
 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
-index 611b5f7..cee0bfb 100644
+index 05bb49e..84d7ce6 100644
 --- a/drivers/md/raid1.c
 +++ b/drivers/md/raid1.c
 @@ -1810,7 +1810,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
@@ -37692,6 +37709,18 @@ index 683bedc..86dba9a 100644
  #endif
         }
  
+diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
+index 4beab94..44149ee 100644
+--- a/drivers/staging/omapdrm/omap_drv.c
++++ b/drivers/staging/omapdrm/omap_drv.c
+@@ -761,7 +761,6 @@ static struct drm_driver omap_drm_driver = {
+                .irq_postinstall = dev_irq_postinstall,
+                .irq_uninstall = dev_irq_uninstall,
+                .irq_handler = dev_irq_handler,
+-               .reclaim_buffers = drm_core_reclaim_buffers,
+ #ifdef CONFIG_DEBUG_FS
+                .debugfs_init = omap_debugfs_init,
+                .debugfs_cleanup = omap_debugfs_cleanup,
 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
 index dc23395..cf7e9b1 100644
 --- a/drivers/staging/rtl8712/rtl871x_io.h
@@ -37938,7 +37967,7 @@ index 9fc9a60..68d4c10 100644
  
  void se_dev_set_default_attribs(
 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
-index 269f544..32def0d 100644
+index 7502660..f214d9f 100644
 --- a/drivers/target/target_core_transport.c
 +++ b/drivers/target/target_core_transport.c
 @@ -1098,7 +1098,7 @@ struct se_device *transport_add_device_to_core_hba(
@@ -44150,19 +44179,6 @@ index e5b7731..b9c59fb 100644
         int err;
         u32 ftype;
         struct ceph_mds_reply_info_parsed *rinfo;
-diff --git a/fs/ceph/export.c b/fs/ceph/export.c
-index 02ce909..9349bb3 100644
---- a/fs/ceph/export.c
-+++ b/fs/ceph/export.c
-@@ -90,6 +90,8 @@ static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len,
-                *max_len = handle_length;
-                type = 255;
-        }
-+       if (dentry)
-+               dput(dentry);
-        return type;
- }
- 
 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
 index d9ea6ed..1e6c8ac 100644
 --- a/fs/cifs/cifs_debug.c
@@ -45787,57 +45803,6 @@ index 5c69f2b..05dec7f 100644
         atomic_t s_lock_busy;
  
         /* locality groups */
-diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
-index 8ce0076..cc2d77c 100644
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -716,6 +716,10 @@ repeat_in_this_group:
-                                   "inode=%lu", ino + 1);
-                        continue;
-                }
-+               BUFFER_TRACE(inode_bitmap_bh, "get_write_access");
-+               err = ext4_journal_get_write_access(handle, inode_bitmap_bh);
-+               if (err)
-+                       goto fail;
-                ext4_lock_group(sb, group);
-                ret2 = ext4_test_and_set_bit(ino, inode_bitmap_bh->b_data);
-                ext4_unlock_group(sb, group);
-@@ -729,6 +733,11 @@ repeat_in_this_group:
-        goto out;
- 
- got:
-+       BUFFER_TRACE(inode_bitmap_bh, "call ext4_handle_dirty_metadata");
-+       err = ext4_handle_dirty_metadata(handle, NULL, inode_bitmap_bh);
-+       if (err)
-+               goto fail;
-+
-        /* We may have to initialize the block bitmap if it isn't already */
-        if (ext4_has_group_desc_csum(sb) &&
-            gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
-@@ -762,11 +771,6 @@ got:
-                        goto fail;
-        }
- 
--       BUFFER_TRACE(inode_bitmap_bh, "get_write_access");
--       err = ext4_journal_get_write_access(handle, inode_bitmap_bh);
--       if (err)
--               goto fail;
--
-        BUFFER_TRACE(group_desc_bh, "get_write_access");
-        err = ext4_journal_get_write_access(handle, group_desc_bh);
-        if (err)
-@@ -814,11 +818,6 @@ got:
-        }
-        ext4_unlock_group(sb, group);
- 
--       BUFFER_TRACE(inode_bitmap_bh, "call ext4_handle_dirty_metadata");
--       err = ext4_handle_dirty_metadata(handle, NULL, inode_bitmap_bh);
--       if (err)
--               goto fail;
--
-        BUFFER_TRACE(group_desc_bh, "call ext4_handle_dirty_metadata");
-        err = ext4_handle_dirty_metadata(handle, NULL, group_desc_bh);
-        if (err)
 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
 index b26410c..7383d90 100644
 --- a/fs/ext4/mballoc.c
@@ -47737,7 +47702,7 @@ index 7e81bfc..c3649aa 100644
  
         lock_flocks();
 diff --git a/fs/namei.c b/fs/namei.c
-index 091c4b7..c6d7e26 100644
+index 091c4b7..fbcb268 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -265,16 +265,32 @@ int generic_permission(struct inode *inode, int mask)
@@ -47822,6 +47787,15 @@ index 091c4b7..c6d7e26 100644
                 put_link(nd, &link, cookie);
         } while (res > 0);
  
+@@ -1648,7 +1664,7 @@ EXPORT_SYMBOL(full_name_hash);
+ static inline unsigned long hash_name(const char *name, unsigned int *hashp)
+ {
+        unsigned long a, b, adata, bdata, mask, hash, len;
+-       const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
++       static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
+ 
+        hash = a = 0;
+        len = -sizeof(unsigned long);
 @@ -1943,6 +1959,8 @@ static int path_lookupat(int dfd, const char *name,
                         if (err)
                                 break;
@@ -71437,6 +71411,32 @@ index e796429..6e38f9f 100644
  
  static inline void *ptr_to_indirect(void *ptr)
  {
+diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
+index bb2b201..46abaf9 100644
+--- a/lib/strncpy_from_user.c
++++ b/lib/strncpy_from_user.c
+@@ -21,7 +21,7 @@
+  */
+ static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
+ {
+-       const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
++       static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
+        long res = 0;
+ 
+        /*
+diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
+index a28df52..3d55877 100644
+--- a/lib/strnlen_user.c
++++ b/lib/strnlen_user.c
+@@ -26,7 +26,7 @@
+  */
+ static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
+ {
+-       const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
++       static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
+        long align, res = 0;
+        unsigned long c;
+ 
 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
 index 0e33754..50a0e63 100644
 --- a/lib/vsprintf.c
@@ -76074,7 +76074,7 @@ index 23f45ce..c748f1a 100644
  #undef __HANDLE_ITEM
  }
 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
-index 469daab..9fc7f8d 100644
+index 469daab..262851c 100644
 --- a/net/batman-adv/bat_iv_ogm.c
 +++ b/net/batman-adv/bat_iv_ogm.c
 @@ -62,7 +62,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
@@ -76086,15 +76086,6 @@ index 469daab..9fc7f8d 100644
  
         hard_iface->packet_len = BATADV_OGM_HLEN;
         hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC);
-@@ -191,7 +191,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,
-                                                            "Sending own" :
-                                                            "Forwarding"));
-                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
--                          "%s %spacket (originator %pM, seqno %u, TQ %d, TTL %d, IDF %s, ttvn %d) on interface %s [%pM]\n",
-+                          "%s %spacket (originator %pM, s_uncheckedeqno %u, TQ %d, TTL %d, IDF %s, ttvn %d) on interface %s [%pM]\n",
-                           fwd_str, (packet_num > 0 ? "aggregated " : ""),
-                           batadv_ogm_packet->orig,
-                           ntohl(batadv_ogm_packet->seqno),
 @@ -600,8 +600,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
  
         /* change sequence number to network order */