[arch-commits] Commit in linux-lts/trunk (5 files)
Andreas Radke
andyrtr at archlinux.org
Sun Feb 25 14:23:34 UTC 2018
Date: Sunday, February 25, 2018 @ 14:23:34
Author: andyrtr
Revision: 317491
upgpkg: linux-lts 4.14.22-1
upstream update 4.14.22
Added:
linux-lts/trunk/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
(from rev 317490, linux-lts/trunk/0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch)
Modified:
linux-lts/trunk/PKGBUILD
Deleted:
linux-lts/trunk/0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch
linux-lts/trunk/0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
linux-lts/trunk/0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
-----------------------------------------------------------------+
0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch | 57 ----------
0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 42 +++++++
0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch | 49 --------
0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 42 -------
PKGBUILD | 13 --
5 files changed, 46 insertions(+), 157 deletions(-)
Deleted: 0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch
===================================================================
--- 0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch 2018-02-25 14:16:30 UTC (rev 317490)
+++ 0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch 2018-02-25 14:23:34 UTC (rev 317491)
@@ -1,57 +0,0 @@
-From 8514970bf07bd1cc522f50e882e0159a51a39264 Mon Sep 17 00:00:00 2001
-Message-Id: <8514970bf07bd1cc522f50e882e0159a51a39264.1516188238.git.jan.steffens at gmail.com>
-In-Reply-To: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
-References: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
-From: Mohamed Ghannam <simo.ghannam at gmail.com>
-Date: Tue, 5 Dec 2017 20:58:35 +0000
-Subject: [PATCH 2/4] dccp: CVE-2017-8824: use-after-free in DCCP code
-
-Whenever the sock object is in DCCP_CLOSED state,
-dccp_disconnect() must free dccps_hc_tx_ccid and
-dccps_hc_rx_ccid and set to NULL.
-
-Signed-off-by: Mohamed Ghannam <simo.ghannam at gmail.com>
-Reviewed-by: Eric Dumazet <edumazet at google.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
----
- net/dccp/proto.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/net/dccp/proto.c b/net/dccp/proto.c
-index b68168fcc06a..9d43c1f40274 100644
---- a/net/dccp/proto.c
-+++ b/net/dccp/proto.c
-@@ -259,25 +259,30 @@ int dccp_disconnect(struct sock *sk, int flags)
- {
- struct inet_connection_sock *icsk = inet_csk(sk);
- struct inet_sock *inet = inet_sk(sk);
-+ struct dccp_sock *dp = dccp_sk(sk);
- int err = 0;
- const int old_state = sk->sk_state;
-
- if (old_state != DCCP_CLOSED)
- dccp_set_state(sk, DCCP_CLOSED);
-
- /*
- * This corresponds to the ABORT function of RFC793, sec. 3.8
- * TCP uses a RST segment, DCCP a Reset packet with Code 2, "Aborted".
- */
- if (old_state == DCCP_LISTEN) {
- inet_csk_listen_stop(sk);
- } else if (dccp_need_reset(old_state)) {
- dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED);
- sk->sk_err = ECONNRESET;
- } else if (old_state == DCCP_REQUESTING)
- sk->sk_err = ECONNRESET;
-
- dccp_clear_xmit_timers(sk);
-+ ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk);
-+ ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk);
-+ dp->dccps_hc_rx_ccid = NULL;
-+ dp->dccps_hc_tx_ccid = NULL;
-
- __skb_queue_purge(&sk->sk_receive_queue);
- __skb_queue_purge(&sk->sk_write_queue);
---
-2.15.1
-
Copied: linux-lts/trunk/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch (from rev 317490, linux-lts/trunk/0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch)
===================================================================
--- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch (rev 0)
+++ 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-02-25 14:23:34 UTC (rev 317491)
@@ -0,0 +1,42 @@
+From e722c8d112f0aa9621d7d4da5223cfc7aeb45e88 Mon Sep 17 00:00:00 2001
+Message-Id: <e722c8d112f0aa9621d7d4da5223cfc7aeb45e88.1516188238.git.jan.steffens at gmail.com>
+In-Reply-To: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
+References: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
+From: Jim Bride <jim.bride at linux.intel.com>
+Date: Mon, 6 Nov 2017 13:38:57 -0800
+Subject: [PATCH 4/4] drm/i915/edp: Only use the alternate fixed mode if it's
+ asked for
+
+In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
+eDP if available."), the patch allows for the use of an alternate fixed
+mode if it is available, but the patch was not ensuring that the only
+time the alternate mode is used is when it is specifically requested.
+This patch adds an additional comparison to intel_edp_compare_alt_mode
+to ensure that we only use the alternate mode if it is directly
+requested.
+
+Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.")
+Cc: David Weinehall <david.weinehall at linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
+Signed-off-by: Jim Bride <jim.bride at linux.intel.com>
+---
+ drivers/gpu/drm/i915/intel_dp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index 09f274419eea..838cee312e8e 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -1632,7 +1632,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
+ m1->vdisplay == m2->vdisplay &&
+ m1->vsync_start == m2->vsync_start &&
+ m1->vsync_end == m2->vsync_end &&
+- m1->vtotal == m2->vtotal);
++ m1->vtotal == m2->vtotal &&
++ m1->vrefresh == m2->vrefresh);
+ return bres;
+ }
+
+--
+2.15.1
+
Deleted: 0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
===================================================================
--- 0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch 2018-02-25 14:16:30 UTC (rev 317490)
+++ 0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch 2018-02-25 14:23:34 UTC (rev 317491)
@@ -1,49 +0,0 @@
-From c9c8995fc83b476fdf3fc0c4b498feef2949ec75 Mon Sep 17 00:00:00 2001
-Message-Id: <c9c8995fc83b476fdf3fc0c4b498feef2949ec75.1516188238.git.jan.steffens at gmail.com>
-In-Reply-To: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
-References: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
-From: Steffen Klassert <steffen.klassert at secunet.com>
-Date: Fri, 22 Dec 2017 10:44:57 +0100
-Subject: [PATCH 3/4] xfrm: Fix stack-out-of-bounds read on socket policy
- lookup.
-
-When we do tunnel or beet mode, we pass saddr and daddr from the
-template to xfrm_state_find(), this is ok. On transport mode,
-we pass the addresses from the flowi, assuming that the IP
-addresses (and address family) don't change during transformation.
-This assumption is wrong in the IPv4 mapped IPv6 case, packet
-is IPv4 and template is IPv6.
-
-Fix this by catching address family missmatches of the policy
-and the flow already before we do the lookup.
-
-Reported-by: syzbot <syzkaller at googlegroups.com>
-Signed-off-by: Steffen Klassert <steffen.klassert at secunet.com>
----
- net/xfrm/xfrm_policy.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 6bc16bb61b55..50c5f46b5cca 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -1169,9 +1169,15 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir,
- again:
- pol = rcu_dereference(sk->sk_policy[dir]);
- if (pol != NULL) {
-- bool match = xfrm_selector_match(&pol->selector, fl, family);
-+ bool match;
- int err = 0;
-
-+ if (pol->family != family) {
-+ pol = NULL;
-+ goto out;
-+ }
-+
-+ match = xfrm_selector_match(&pol->selector, fl, family);
- if (match) {
- if ((sk->sk_mark & pol->mark.m) != pol->mark.v) {
- pol = NULL;
---
-2.15.1
-
Deleted: 0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
===================================================================
--- 0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-02-25 14:16:30 UTC (rev 317490)
+++ 0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-02-25 14:23:34 UTC (rev 317491)
@@ -1,42 +0,0 @@
-From e722c8d112f0aa9621d7d4da5223cfc7aeb45e88 Mon Sep 17 00:00:00 2001
-Message-Id: <e722c8d112f0aa9621d7d4da5223cfc7aeb45e88.1516188238.git.jan.steffens at gmail.com>
-In-Reply-To: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
-References: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
-From: Jim Bride <jim.bride at linux.intel.com>
-Date: Mon, 6 Nov 2017 13:38:57 -0800
-Subject: [PATCH 4/4] drm/i915/edp: Only use the alternate fixed mode if it's
- asked for
-
-In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
-eDP if available."), the patch allows for the use of an alternate fixed
-mode if it is available, but the patch was not ensuring that the only
-time the alternate mode is used is when it is specifically requested.
-This patch adds an additional comparison to intel_edp_compare_alt_mode
-to ensure that we only use the alternate mode if it is directly
-requested.
-
-Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.")
-Cc: David Weinehall <david.weinehall at linux.intel.com>
-Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
-Signed-off-by: Jim Bride <jim.bride at linux.intel.com>
----
- drivers/gpu/drm/i915/intel_dp.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 09f274419eea..838cee312e8e 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1632,7 +1632,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
- m1->vdisplay == m2->vdisplay &&
- m1->vsync_start == m2->vsync_start &&
- m1->vsync_end == m2->vsync_end &&
-- m1->vtotal == m2->vtotal);
-+ m1->vtotal == m2->vtotal &&
-+ m1->vrefresh == m2->vrefresh);
- return bres;
- }
-
---
-2.15.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-25 14:16:30 UTC (rev 317490)
+++ PKGBUILD 2018-02-25 14:23:34 UTC (rev 317491)
@@ -4,7 +4,7 @@
pkgbase=linux-lts
#pkgbase=linux-lts-custom
_srcname=linux-4.14
-pkgver=4.14.21
+pkgver=4.14.22
pkgrel=1
arch=('x86_64')
url="https://www.kernel.org/"
@@ -18,8 +18,7 @@
'90-linux.hook' # pacman hook for initramfs regeneration
'linux-lts.preset' # standard config files for mkinitcpio ramdisk
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
- 0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
- 0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch)
+ 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch)
validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds at linux-foundation.org>
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg at kroah.com>
)
@@ -26,7 +25,7 @@
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'SKIP'
- '4d888fb78a52e556948483c8410159a83c51195eb7637f084d6f19f014fff448'
+ '6df3b1cea7091380949dcb33a8313bdfd4b26227584569753ff6c8d161ee1cf7'
'SKIP'
'c645053c4525a1a70d5c10b52257ac136da7e9059b6a4a566a857a3d42046426'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -33,7 +32,6 @@
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98'
- '2f46093fde72eabc0fd25eff5065d780619fc5e7d2143d048877a8220d6291b0'
'6364edabad4182dcf148ae7c14d8f45d61037d4539e76486f978f1af3a090794')
_kernelname=${pkgbase#linux}
@@ -53,11 +51,8 @@
# disable USER_NS for non-root users by default
patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
- # https://bugs.archlinux.org/task/56605
- patch -Np1 -i ../0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
-
# https://bugs.archlinux.org/task/56711
- patch -Np1 -i ../0003-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+ patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
cp -Tf ../config .config
More information about the arch-commits
mailing list