summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO24
-rw-r--r--0011-kernfs-fix-removed-error-check.patch13
-rw-r--r--0012-fix-saa7134.patch37
-rw-r--r--0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch13
-rw-r--r--0014-fix-rtl8192se.patch15
-rw-r--r--0015-fix-xsdt-validation.patch42
-rw-r--r--PKGBUILD48
-rw-r--r--config7
-rw-r--r--config.x86_647
-rw-r--r--linux-selinux.install2
10 files changed, 183 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0464707fca56..8f5e9acec53a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-selinux
- pkgver = 3.14.1
+ pkgver = 3.14.2
pkgrel = 1
url = http://www.kernel.org/
arch = i686
@@ -13,7 +13,7 @@ pkgbase = linux-selinux
makedepends = bc
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.14.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.2.xz
source = config
source = config.x86_64
source = linux-selinux.preset
@@ -25,13 +25,16 @@ pkgbase = linux-selinux
source = 0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
source = 0006-genksyms-fix-typeof-handling.patch
source = 0007-x86-efi-Correct-EFI-boot-stub-use-of-code32_start.patch
- source = 0008-futex-avoid-race-between-requeue-and-wake.patch
- source = 0009-iwlwifi-mvm-rs-fix-search-cycle-rules.patch
source = 0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch
+ source = 0011-kernfs-fix-removed-error-check.patch
+ source = 0012-fix-saa7134.patch
+ source = 0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
+ source = 0014-fix-rtl8192se.patch
+ source = 0015-fix-xsdt-validation.patch
sha256sums = 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa
- sha256sums = ac56f0bff3c6ec436161f2702c7269b933e22bae0488ed709ab29e4aeb78be45
- sha256sums = 4c1bacbafea62ca9db8207f1deebab3973acf6a7a1b327327f49733f7fc699da
- sha256sums = d13e8d4d85b1211ae85df42b8b1fc79ab006516c2e8de52dc9d50ff77559525f
+ sha256sums = 1c7a8fee1674bfa6354dc6e3038ca1f16bc1327b035cd4896b795b482c7d1829
+ sha256sums = db62a32d53b424cf6ac353e9b0defba285232ee2bc73a2bd50518240cf07e5d6
+ sha256sums = b12dbc3e0ce057a3f68a129b6c97fe29f62adca8c1fcc82166968278214e4091
sha256sums = 375da3b030f17581cbf5be9140b79029ca85eebc70197f419a4de77e00fa84e9
sha256sums = faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182
sha256sums = 6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02
@@ -41,9 +44,12 @@ pkgbase = linux-selinux
sha256sums = 3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec
sha256sums = cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7
sha256sums = a98bc3836bcf85774a974a1585e6b64432ba8c42363ee484d14515ccd6a88e24
- sha256sums = f8699fcf4242c0727c3c0af56928515cef9b6ce329968537ce2894b30d43eade
- sha256sums = 1d4c7b24312ed3781e5d139dfb52f0c22350bf5a2845fe747469dfa7b6ed861f
sha256sums = c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85
+ sha256sums = 04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a
+ sha256sums = 79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18
+ sha256sums = f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be
+ sha256sums = ff9df6746d7cbfe858d5b4bce932951c26414a7635cb5c26cd8d5c97df36a2a1
+ sha256sums = 384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4
pkgname = linux-selinux
diff --git a/0011-kernfs-fix-removed-error-check.patch b/0011-kernfs-fix-removed-error-check.patch
new file mode 100644
index 000000000000..b597595c6443
--- /dev/null
+++ b/0011-kernfs-fix-removed-error-check.patch
@@ -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()
diff --git a/0012-fix-saa7134.patch b/0012-fix-saa7134.patch
new file mode 100644
index 000000000000..070fbc8ebd16
--- /dev/null
+++ b/0012-fix-saa7134.patch
@@ -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);
+
diff --git a/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch b/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
new file mode 100644
index 000000000000..2840f190c884
--- /dev/null
+++ b/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
@@ -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)) {
diff --git a/0014-fix-rtl8192se.patch b/0014-fix-rtl8192se.patch
new file mode 100644
index 000000000000..512e2815879b
--- /dev/null
+++ b/0014-fix-rtl8192se.patch
@@ -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;
+ }
+
diff --git a/0015-fix-xsdt-validation.patch b/0015-fix-xsdt-validation.patch
new file mode 100644
index 000000000000..82dd2be25cf9
--- /dev/null
+++ b/0015-fix-xsdt-validation.patch
@@ -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;
+ }
+ }
+
diff --git a/PKGBUILD b/PKGBUILD
index efb0a8ff3cf3..7cb422377230 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=linux-selinux # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name
_srcname=linux-3.14
-pkgver=3.14.1
+pkgver=3.14.2
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
@@ -28,14 +28,17 @@ source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
'0006-genksyms-fix-typeof-handling.patch'
'0007-x86-efi-Correct-EFI-boot-stub-use-of-code32_start.patch'
- '0008-futex-avoid-race-between-requeue-and-wake.patch'
- '0009-iwlwifi-mvm-rs-fix-search-cycle-rules.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'
)
sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
- 'ac56f0bff3c6ec436161f2702c7269b933e22bae0488ed709ab29e4aeb78be45'
- '4c1bacbafea62ca9db8207f1deebab3973acf6a7a1b327327f49733f7fc699da'
- 'd13e8d4d85b1211ae85df42b8b1fc79ab006516c2e8de52dc9d50ff77559525f'
+ '1c7a8fee1674bfa6354dc6e3038ca1f16bc1327b035cd4896b795b482c7d1829'
+ 'db62a32d53b424cf6ac353e9b0defba285232ee2bc73a2bd50518240cf07e5d6'
+ 'b12dbc3e0ce057a3f68a129b6c97fe29f62adca8c1fcc82166968278214e4091'
'375da3b030f17581cbf5be9140b79029ca85eebc70197f419a4de77e00fa84e9'
'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
'6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
@@ -45,9 +48,12 @@ sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
'3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
'a98bc3836bcf85774a974a1585e6b64432ba8c42363ee484d14515ccd6a88e24'
- 'f8699fcf4242c0727c3c0af56928515cef9b6ce329968537ce2894b30d43eade'
- '1d4c7b24312ed3781e5d139dfb52f0c22350bf5a2845fe747469dfa7b6ed861f'
- 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85')
+ 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85'
+ '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a'
+ '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
+ 'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be'
+ 'ff9df6746d7cbfe858d5b4bce932951c26414a7635cb5c26cd8d5c97df36a2a1'
+ '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4')
_kernelname=${pkgbase#linux}
@@ -93,6 +99,30 @@ prepare() {
# https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d
# 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"
if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config
diff --git a/config b/config
index fadf224e0101..322a369cca0e 100644
--- a/config
+++ b/config
@@ -255,8 +255,8 @@ CONFIG_SECCOMP_FILTER=y
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_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_HAVE_ARCH_SOFT_DIRTY=y
@@ -1506,7 +1506,8 @@ CONFIG_DMA_SHARED_BUFFER=y
#
# Bus devices
#
-CONFIG_CONNECTOR=m
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
CONFIG_MTD_TESTS=m
CONFIG_MTD_REDBOOT_PARTS=m
diff --git a/config.x86_64 b/config.x86_64
index 8da9e6c060d2..a933fc6db2c5 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -264,8 +264,8 @@ CONFIG_SECCOMP_FILTER=y
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
@@ -1487,7 +1487,8 @@ CONFIG_DMA_SHARED_BUFFER=y
#
# Bus devices
#
-CONFIG_CONNECTOR=m
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
CONFIG_MTD_TESTS=m
CONFIG_MTD_REDBOOT_PARTS=m
diff --git a/linux-selinux.install b/linux-selinux.install
index eb3372a04a53..707775dfb9fc 100644
--- a/linux-selinux.install
+++ b/linux-selinux.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-selinux
-KERNEL_VERSION=3.14.1-1-selinux
+KERNEL_VERSION=3.14.2-1-selinux
post_install () {
# updating module dependencies