[arch-commits] Commit in linux-grsec/trunk (8 files)
Daniel Micay
thestinger at nymeria.archlinux.org
Mon Apr 28 08:19:15 UTC 2014
Date: Monday, April 28, 2014 @ 10:19:14
Author: thestinger
Revision: 110338
upgpkg: linux-grsec 3.14.2.201404270907-1
Added:
linux-grsec/trunk/0011-kernfs-fix-removed-error-check.patch
linux-grsec/trunk/0012-fix-saa7134.patch
linux-grsec/trunk/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
linux-grsec/trunk/0014-fix-rtl8192se.patch
linux-grsec/trunk/0015-fix-xsdt-validation.patch
Modified:
linux-grsec/trunk/PKGBUILD
linux-grsec/trunk/config
linux-grsec/trunk/config.x86_64
-------------------------------------------------------------------+
0011-kernfs-fix-removed-error-check.patch | 13 +++
0012-fix-saa7134.patch | 37 ++++++++
0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch | 13 +++
0014-fix-rtl8192se.patch | 15 +++
0015-fix-xsdt-validation.patch | 42 ++++++++++
PKGBUILD | 38 ++++++++-
config | 5 -
config.x86_64 | 9 +-
8 files changed, 164 insertions(+), 8 deletions(-)
Added: 0011-kernfs-fix-removed-error-check.patch
===================================================================
--- 0011-kernfs-fix-removed-error-check.patch (rev 0)
+++ 0011-kernfs-fix-removed-error-check.patch 2014-04-28 08:19:14 UTC (rev 110338)
@@ -0,0 +1,13 @@
+diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
+index 8034706..e01ea4a 100644
+--- a/fs/kernfs/file.c
++++ b/fs/kernfs/file.c
+@@ -484,6 +484,8 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma)
+
+ ops = kernfs_ops(of->kn);
+ rc = ops->mmap(of, vma);
++ if (rc)
++ goto out_put;
+
+ /*
+ * PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup()
Added: 0012-fix-saa7134.patch
===================================================================
--- 0012-fix-saa7134.patch (rev 0)
+++ 0012-fix-saa7134.patch 2014-04-28 08:19:14 UTC (rev 110338)
@@ -0,0 +1,37 @@
+--- a/drivers/media/pci/saa7134/saa7134-video.c
++++ a/drivers/media/pci/saa7134/saa7134-video.c
+@@ -1243,6 +1243,7 @@ static int video_release(struct file *file)
+ videobuf_streamoff(&dev->cap);
+ res_free(dev, fh, RESOURCE_VIDEO);
+ videobuf_mmap_free(&dev->cap);
++ INIT_LIST_HEAD(&dev->cap.stream);
+ }
+ if (dev->cap.read_buf) {
+ buffer_release(&dev->cap, dev->cap.read_buf);
+@@ -1254,6 +1255,7 @@ static int video_release(struct file *file)
+ videobuf_stop(&dev->vbi);
+ res_free(dev, fh, RESOURCE_VBI);
+ videobuf_mmap_free(&dev->vbi);
++ INIT_LIST_HEAD(&dev->vbi.stream);
+ }
+
+ /* ts-capture will not work in planar mode, so turn it off Hac: 04.05*/
+@@ -1987,17 +1989,12 @@ int saa7134_streamoff(struct file *file, void *priv,
+ enum v4l2_buf_type type)
+ {
+ struct saa7134_dev *dev = video_drvdata(file);
+- int err;
+ int res = saa7134_resource(file);
+
+ if (res != RESOURCE_EMPRESS)
+ pm_qos_remove_request(&dev->qos_request);
+
+- err = videobuf_streamoff(saa7134_queue(file));
+- if (err < 0)
+- return err;
+- res_free(dev, priv, res);
+- return 0;
++ return videobuf_streamoff(saa7134_queue(file));
+ }
+ EXPORT_SYMBOL_GPL(saa7134_streamoff);
+
Added: 0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
===================================================================
--- 0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch (rev 0)
+++ 0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch 2014-04-28 08:19:14 UTC (rev 110338)
@@ -0,0 +1,13 @@
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 45fa2f1..6088927 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(skb_checksum_help);
+ __be16 skb_network_protocol(struct sk_buff *skb, int *depth)
+ {
+ __be16 type = skb->protocol;
+- int vlan_depth = ETH_HLEN;
++ int vlan_depth = skb->mac_len;
+
+ /* Tunnel gso handlers can set protocol to ethernet. */
+ if (type == htons(ETH_P_TEB)) {
Added: 0014-fix-rtl8192se.patch
===================================================================
--- 0014-fix-rtl8192se.patch (rev 0)
+++ 0014-fix-rtl8192se.patch 2014-04-28 08:19:14 UTC (rev 110338)
@@ -0,0 +1,15 @@
+--- linux-2.6/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
++++ linux-2.6/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+@@ -49,6 +49,12 @@ static u8 _rtl92se_map_hwqueue_to_fwqueu
+ if (ieee80211_is_nullfunc(fc))
+ return QSLT_HIGH;
+
++ /* Kernel commit 1bf4bbb4024dcdab changed EAPOL packets to use
++ * queue V0 at priority 7; however, the RTL8192SE appears to have
++ * that queue at priority 6
++ */
++ if (skb->priority == 7)
++ return QSLT_VO;
+ return skb->priority;
+ }
+
Added: 0015-fix-xsdt-validation.patch
===================================================================
--- 0015-fix-xsdt-validation.patch (rev 0)
+++ 0015-fix-xsdt-validation.patch 2014-04-28 08:19:14 UTC (rev 110338)
@@ -0,0 +1,42 @@
+@@ -, +, @@
+ acpi_tb_parse_root_table().
+ Commit: 671cc68dc61f029d44b43a681356078e02d8dab8
+ Subject: ACPICA: Back port and refine validation of the XSDT root table.
+---
+ drivers/acpi/acpica/tbutils.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+--- a/drivers/acpi/acpica/tbutils.c
++++ a/drivers/acpi/acpica/tbutils.c
+@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
+ u32 table_count;
+ struct acpi_table_header *table;
+ acpi_physical_address address;
++ acpi_physical_address rsdt_address;
+ u32 length;
+ u8 *table_entry;
+ acpi_status status;
+@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
+ * as per the ACPI specification.
+ */
+ address = (acpi_physical_address) rsdp->xsdt_physical_address;
++ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address;
+ table_entry_size = ACPI_XSDT_ENTRY_SIZE;
+ } else {
+ /* Root table is an RSDT (32-bit physical addresses) */
+
+ address = (acpi_physical_address) rsdp->rsdt_physical_address;
++ rsdt_address = address;
+ table_entry_size = ACPI_RSDT_ENTRY_SIZE;
+ }
+
+@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
+
+ /* Fall back to the RSDT */
+
+- address =
+- (acpi_physical_address) rsdp->rsdt_physical_address;
++ address = rsdt_address;
+ table_entry_size = ACPI_RSDT_ENTRY_SIZE;
+ }
+ }
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-28 06:46:26 UTC (rev 110337)
+++ PKGBUILD 2014-04-28 08:19:14 UTC (rev 110338)
@@ -34,6 +34,11 @@
'0006-genksyms-fix-typeof-handling.patch'
'0007-x86-efi-Correct-EFI-boot-stub-use-of-code32_start.patch'
'0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch'
+ '0011-kernfs-fix-removed-error-check.patch'
+ '0012-fix-saa7134.patch'
+ '0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch'
+ '0014-fix-rtl8192se.patch'
+ '0015-fix-xsdt-validation.patch'
sysctl.conf
)
md5sums=('b621207b3f6ecbb67db18b13258f8ea8'
@@ -40,8 +45,8 @@
'f2239bf772d1b6e1c26cb03f6e056959'
'108a9ec62f9015ed17cd91f40087ea03'
'SKIP'
- '0b500c543d55a23a05e9fb0c1c8b3af3'
- '34a568e8b02a9c4cdece5ae7e890cdbc'
+ 'bdc21c0e7072b0ce9a0f80140c8f759b'
+ 'e2ed1a476239147e7e09900bc6e5a3bc'
'2f4e8da2611ce693f5f77806a0ffb858'
'98beb36f9b8cf16e58de2483ea9985e3'
'6839ddec74a5300beff1709a81b0e4f3'
@@ -52,6 +57,11 @@
'16a161979f846b049e90daea907c35dd'
'00727251b0d337a25d3ca392218afdf4'
'353b553d69da810ef954618aca60e1e2'
+ 'b3f98eba6322463ed6644784c56893be'
+ '4f547d79fa1b2bb855dc2996be2a515e'
+ '21d25aef69f9da33c6087b7ffd97783e'
+ 'de37a66f5ebcccbc13208515ccc081cb'
+ '278417ab07b6f5fe8e3e0ed656f35f3e'
'7a052645280da78a98bfe8cf805ddab5')
_kernelname=${pkgbase#linux}
@@ -99,6 +109,30 @@
# FS#39815
patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch"
+ # fix Xorg crash with i810 chipset due to wrong removed error check
+ # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com
+ patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch"
+
+ # fix saa7134 video
+ # https://bugs.archlinux.org/task/39904
+ # https://bugzilla.kernel.org/show_bug.cgi?id=73361
+ patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch"
+
+ # fix tun/openvpn performance
+ # https://bugs.archlinux.org/task/40089
+ # https://bugzilla.kernel.org/show_bug.cgi?id=74051
+ patch -Np1 -i "${srcdir}/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch"
+
+ # fix rtl8192se authentification
+ # https://bugs.archlinux.org/task/39858
+ # https://bugzilla.kernel.org/show_bug.cgi?id=74541
+ patch -Np1 -i "${srcdir}/0014-fix-rtl8192se.patch"
+
+ # fix xsdt validation bug
+ # https://bugs.archlinux.org/task/39811
+ # https://bugzilla.kernel.org/show_bug.cgi?id=73911
+ patch -Np1 -i "${srcdir}/0015-fix-xsdt-validation.patch"
+
# Add grsecurity patches
patch -Np1 -i "$srcdir/$_grsec_patch"
rm localversion-grsec
Modified: config
===================================================================
--- config 2014-04-28 06:46:26 UTC (rev 110337)
+++ config 2014-04-28 08:19:14 UTC (rev 110338)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.1-1 Kernel Configuration
+# Linux/x86 3.14.2-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1489,7 +1489,8 @@
#
# Bus devices
#
-CONFIG_CONNECTOR=m
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
CONFIG_MTD_TESTS=m
CONFIG_MTD_REDBOOT_PARTS=m
Modified: config.x86_64
===================================================================
--- config.x86_64 2014-04-28 06:46:26 UTC (rev 110337)
+++ config.x86_64 2014-04-28 08:19:14 UTC (rev 110338)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.1-1 Kernel Configuration
+# Linux/x86 3.14.2-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -260,8 +260,8 @@
CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_CC_STACKPROTECTOR=y
# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -1474,7 +1474,8 @@
#
# Bus devices
#
-CONFIG_CONNECTOR=m
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
CONFIG_MTD_TESTS=m
CONFIG_MTD_REDBOOT_PARTS=m
More information about the arch-commits
mailing list