core/linux-armv7 to 4.8.14-1

This commit is contained in:
Kevin Mihelich 2016-12-12 00:47:56 +00:00
parent 89cab686d2
commit ceef7499a5
15 changed files with 42 additions and 137 deletions

View file

@ -1,7 +1,7 @@
From a57e3555178ce90e3ec10cc1a2a10d4ed5662483 Mon Sep 17 00:00:00 2001
From 3a71f920fb71aaf3c8a74a73d5bba925752e8390 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:59:28 +0100
Subject: [PATCH 01/14] ARM: atags: add support for Marvell's u-boot
Subject: [PATCH 01/13] ARM: atags: add support for Marvell's u-boot
Marvell uses a specific atag in its u-boot which includes among other
information the MAC addresses for up to 4 network interfaces.

View file

@ -1,7 +1,7 @@
From d4b1e1b9567a0cbd568f68d3d3a2af24b5966aa7 Mon Sep 17 00:00:00 2001
From f414d34637b5ffb6cf3e3b9849cd5cc584ef8f19 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:56:58 +0100
Subject: [PATCH 02/14] ARM: atags/fdt: retrieve MAC addresses from Marvell
Subject: [PATCH 02/13] ARM: atags/fdt: retrieve MAC addresses from Marvell
boot loader
The atags are parsed and if a Marvell atag is found, up to 4 MAC

View file

@ -1,7 +1,7 @@
From 020369fee4748079122381c733ec409e1e7d99bd Mon Sep 17 00:00:00 2001
From 922440581e2bf77e75230b926ad5fe746327209a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:41:19 -0600
Subject: [PATCH 03/14] SMILE Plug device tree file
Subject: [PATCH 03/13] SMILE Plug device tree file
This adds a dts file for the SMILE Plug, which only differs from the Mirabox
dts with the LED definitions.

View file

@ -1,7 +1,7 @@
From 5820f95d6d39f4864a3a2b70100aea4ad6e7e63e Mon Sep 17 00:00:00 2001
From edb8d8e73417db6941473734b9cfb673c7089f72 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:43:56 -0600
Subject: [PATCH 04/14] fix mvsdio eMMC timing
Subject: [PATCH 04/13] fix mvsdio eMMC timing
These changes from Globalscale change the MMC timing to allow the eMMC versions
of the Mirabox and SMILE Plug to work.

View file

@ -1,7 +1,7 @@
From bb274c7705fb5f0dee7db5d8e647107a4c887313 Mon Sep 17 00:00:00 2001
From a6b9bd0029d9453d4f59bc367f9a33e1a3285709 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH 05/14] net/smsc95xx: Allow mac address to be set as a
Subject: [PATCH 05/13] net/smsc95xx: Allow mac address to be set as a
parameter
---

View file

@ -1,7 +1,7 @@
From 344aa72a0e0258339d8880c0a271278fa7a4e038 Mon Sep 17 00:00:00 2001
From 927b66f6154db0cf7eb5a6d016a1e53d742a8098 Mon Sep 17 00:00:00 2001
From: dobatog <dobatog@gmail.com>
Date: Thu, 26 Feb 2015 12:32:27 +0100
Subject: [PATCH 06/14] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
Subject: [PATCH 06/13] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
related to input routing signals.
The following patch, based on stable v3.19, corrects the errors that are reported in the boot trace in reference to the Input Signals of the audio codec TLV320AIC23:

View file

@ -1,7 +1,7 @@
From 32a95d6fee9947fe97e24514d678c5eca8fd1852 Mon Sep 17 00:00:00 2001
From 42885038fd78080edabbce377800994337fbc644 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 14 Feb 2015 12:32:27 +0100
Subject: [PATCH 07/14] set default cubietruck led triggers
Subject: [PATCH 07/13] set default cubietruck led triggers
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---

View file

@ -1,7 +1,7 @@
From 306ad6775987fc05cf621627b60ce6de752e9441 Mon Sep 17 00:00:00 2001
From e603d79db1ce38be15a8b7d1514301a67d88f920 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 7 Feb 2015 12:32:27 +0100
Subject: [PATCH 08/14] USB armory support
Subject: [PATCH 08/13] USB armory support
---
arch/arm/boot/dts/Makefile | 5 +

View file

@ -1,7 +1,7 @@
From c1262b3c0789f3038f555808ed979a613bdd91f7 Mon Sep 17 00:00:00 2001
From aff9e86fd148f61a7c70333cf02b70189790df26 Mon Sep 17 00:00:00 2001
From: Vanessa Maegima <vanessa.maegima@nxp.com>
Date: Mon, 1 Aug 2016 09:54:14 -0300
Subject: [PATCH 09/14] ARM: dts: imx6ul-pico-hobbit: Add Wifi support
Subject: [PATCH 09/13] ARM: dts: imx6ul-pico-hobbit: Add Wifi support
imx6ul-pico-hobbit has a bcm4339 wifi chip connected to usdhc2 port.

View file

@ -1,7 +1,7 @@
From 7b506e952b0a50ae9bfabc08f0e4a5c46f8c6c37 Mon Sep 17 00:00:00 2001
From bbaf3b78f27ea3557ce35e4267398e215091b68a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 11 Aug 2016 00:42:37 -0600
Subject: [PATCH 10/14] exynos4412-odroid: set higher minimum buck2 regulator
Subject: [PATCH 10/13] exynos4412-odroid: set higher minimum buck2 regulator
voltage
Set a higher minimum voltage to help reboot issue.

View file

@ -1,7 +1,7 @@
From 05fe3b31380ee9bf5ee6258b50980637307f7691 Mon Sep 17 00:00:00 2001
From 7b64f74c06cacdba5eab9275f57df212540cad2e Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 30 Sep 2016 11:10:10 -0700
Subject: [PATCH 11/14] usb: musb: Call pm_runtime from musb_gadget_queue
Subject: [PATCH 11/13] usb: musb: Call pm_runtime from musb_gadget_queue
If we're booting pandaboard using NFSroot over built-in g_ether, we
can get the following after booting once and doing a warm reset:

View file

@ -1,7 +1,7 @@
From 8cbab23ba33112e37adff7ae353088738f31fac3 Mon Sep 17 00:00:00 2001
From 842bdf96a2e7a63ece87458ad7ecf1ded6a40a12 Mon Sep 17 00:00:00 2001
From: Andreas Kemnade <andreas@kemnade.info>
Date: Mon, 22 Aug 2016 21:24:22 +0200
Subject: [PATCH 12/14] phy-twl4030-usb: better handle musb_mailbox() failure
Subject: [PATCH 12/13] phy-twl4030-usb: better handle musb_mailbox() failure
setting twl->linkstat = MUSB_UNKNOWN upon error in musb_mailbox as
introduced in

View file

@ -1,7 +1,7 @@
From c4a475d5c9cc9706eccd849788bd3879433ae429 Mon Sep 17 00:00:00 2001
From edbf64b26ba15e05cd15ea75bca263a5e748049f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 4 Oct 2016 22:15:41 -0600
Subject: [PATCH 13/14] Revert "gpu: drm: omapdrm: dss-of: add missing
Subject: [PATCH 13/13] Revert "gpu: drm: omapdrm: dss-of: add missing
of_node_put after calling of_parse_phandle"
This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.

View file

@ -1,92 +0,0 @@
From fb1d5a048f54529294ff1e16dae103a579450e06 Mon Sep 17 00:00:00 2001
From: Philip Pettersson <philip.pettersson@gmail.com>
Date: Wed, 30 Nov 2016 14:55:36 -0800
Subject: [PATCH 14/14] packet: fix race condition in packet_set_ring
When packet_set_ring creates a ring buffer it will initialize a
struct timer_list if the packet version is TPACKET_V3. This value
can then be raced by a different thread calling setsockopt to
set the version to TPACKET_V1 before packet_set_ring has finished.
This leads to a use-after-free on a function pointer in the
struct timer_list when the socket is closed as the previously
initialized timer will not be deleted.
The bug is fixed by taking lock_sock(sk) in packet_setsockopt when
changing the packet version while also taking the lock at the start
of packet_set_ring.
Fixes: f6fb8f100b80 ("af-packet: TPACKET_V3 flexible buffer implementation.")
Signed-off-by: Philip Pettersson <philip.pettersson@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/packet/af_packet.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index d2238b2..dd23323 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3648,19 +3648,25 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
if (optlen != sizeof(val))
return -EINVAL;
- if (po->rx_ring.pg_vec || po->tx_ring.pg_vec)
- return -EBUSY;
if (copy_from_user(&val, optval, sizeof(val)))
return -EFAULT;
switch (val) {
case TPACKET_V1:
case TPACKET_V2:
case TPACKET_V3:
- po->tp_version = val;
- return 0;
+ break;
default:
return -EINVAL;
}
+ lock_sock(sk);
+ if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) {
+ ret = -EBUSY;
+ } else {
+ po->tp_version = val;
+ ret = 0;
+ }
+ release_sock(sk);
+ return ret;
}
case PACKET_RESERVE:
{
@@ -4164,6 +4170,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
/* Added to avoid minimal code churn */
struct tpacket_req *req = &req_u->req;
+ lock_sock(sk);
/* Opening a Tx-ring is NOT supported in TPACKET_V3 */
if (!closing && tx_ring && (po->tp_version > TPACKET_V2)) {
net_warn_ratelimited("Tx-ring is not supported.\n");
@@ -4245,7 +4252,6 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
goto out;
}
- lock_sock(sk);
/* Detach socket from network */
spin_lock(&po->bind_lock);
@@ -4294,11 +4300,11 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
if (!tx_ring)
prb_shutdown_retire_blk_timer(po, rb_queue);
}
- release_sock(sk);
if (pg_vec)
free_pg_vec(pg_vec, order, req->tp_block_nr);
out:
+ release_sock(sk);
return err;
}
--
2.10.2

View file

@ -7,7 +7,7 @@ pkgbase=linux-armv7
_srcname=linux-4.8
_kernelname=${pkgbase#linux}
_desc="ARMv7 multi-platform"
pkgver=4.8.13
pkgver=4.8.14
pkgrel=1
rcnrel=armv7-x4
arch=('armv7h')
@ -31,29 +31,27 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'0011-usb-musb-Call-pm_runtime-from-musb_gadget_queue.patch'
'0012-phy-twl4030-usb-better-handle-musb_mailbox-failure.patch'
'0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch'
'0014-packet-fix-race-condition-in-packet_set_ring.patch'
'config'
'cmdline'
'kernel.its'
'kernel.keyblock'
'kernel_data_key.vbprivk')
md5sums=('c1af0afbd3df35c1ccdc7a5118cd2d07'
'bc208ac66340464839ee61a4621d9384'
'7b7f99dcaa93d1e7c72b1f222408d8bd'
'a791295ff27d5033391c8a6c7dd94906'
'ea0de10fdeb3128b4a6105d7afc21937'
'70f9b46e1edd04f15beb77c6ed9082e3'
'0b8b9907d87508df0bfff93741d8612d'
'81ebdb182f0ebb8e49b5ddf70cfdd42a'
'ba8b72ef31241be015ba6448db992d60'
'731c133b688c652c66044107bbea3329'
'4b8a98494dbf3d72ec9056809c8cfcb5'
'33678562233330cfdff3f34f2f4a3502'
'be01139e6b32750d99276c7ed7aaaaa3'
'005bef75c8d791061479856ee33c84f9'
'db1a8f4f8791ac83df1ac6630fcc5b23'
'222218184b192bebce9f605e33378417'
'ab8688fe323d131480f35ba4c259f63c'
'b8001f580c4da45ee7ae8d928275cf97'
'22a06efd1043cc1277491dd7e8a5d2b9'
'99876bcdfd547b77a3e3fb9dd3855e51'
'c87584adb719fcf6a6719002173ba787'
'47006208a269d1ab012c541cff960477'
'8372cd942497315cf87503adf3934559'
'c6f8a30d5d81262a876a94f56d4c8b6a'
'f0c328a1d6327798061bb0c090051faf'
'ee6399335c51e3620f442a6f028bdfe9'
'b389617d3d727d42b91dda4b902080b3'
'6c9d196f824477729205f5ada97e6f3f'
'bb1bf106206556ea50de8abf17480ed5'
'64299c3cef27f4b0589bc3e670b8cc94'
'6edccdddef30c8fadfc336f8788d6358'
'042480e804938026b46b824cf8041b05'
'af1eaa3304bc4776796221b1b12b6b0a'
'1813b39074d01af6548951764a0f6444'
'4f2379ed84258050edb858ee8d281678'
@ -83,7 +81,6 @@ prepare() {
git apply ../0011-usb-musb-Call-pm_runtime-from-musb_gadget_queue.patch
git apply ../0012-phy-twl4030-usb-better-handle-musb_mailbox-failure.patch
git apply ../0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch
git apply ../0014-packet-fix-race-condition-in-packet_set_ring.patch
cat "${srcdir}/config" > ./.config