4.8.14-1
This commit is contained in:
Jan Alexander Steffens
parent
d1704aef56
commit
bccdfbf7cc
|
|
@ -0,0 +1,65 @@
|
|||
From 885bad1e5f32bbf30787ead9578f8174047e6904 Mon Sep 17 00:00:00 2001
|
||||
From: Yu-cheng Yu <yu-cheng.yu@intel.com>
|
||||
Date: Thu, 17 Nov 2016 09:11:35 -0800
|
||||
Subject: [PATCH] x86/fpu: Fix invalid FPU ptrace state after execve()
|
||||
|
||||
commit b22cbe404a9cc3c7949e380fa1861e31934c8978 upstream.
|
||||
|
||||
Robert O'Callahan reported that after an execve PTRACE_GETREGSET
|
||||
NT_X86_XSTATE continues to return the pre-exec register values
|
||||
until the exec'ed task modifies FPU state.
|
||||
|
||||
The test code is at:
|
||||
|
||||
https://bugzilla.redhat.com/attachment.cgi?id=1164286.
|
||||
|
||||
What is happening is fpu__clear() does not properly clear fpstate.
|
||||
Fix it by doing just that.
|
||||
|
||||
Reported-by: Robert O'Callahan <robert@ocallahan.org>
|
||||
Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
|
||||
Cc: Andy Lutomirski <luto@kernel.org>
|
||||
Cc: Borislav Petkov <bp@suse.de>
|
||||
Cc: David Hansen <dave.hansen@linux.intel.com>
|
||||
Cc: Fenghua Yu <fenghua.yu@intel.com>
|
||||
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
||||
Cc: Ravi V. Shankar <ravi.v.shankar@intel.com>
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Link: http://lkml.kernel.org/r/1479402695-6553-1-git-send-email-yu-cheng.yu@intel.com
|
||||
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
arch/x86/kernel/fpu/core.c | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
|
||||
index 3fc03a09a93b1710..c289e2f4a6e5b464 100644
|
||||
--- a/arch/x86/kernel/fpu/core.c
|
||||
+++ b/arch/x86/kernel/fpu/core.c
|
||||
@@ -517,14 +517,14 @@ void fpu__clear(struct fpu *fpu)
|
||||
{
|
||||
WARN_ON_FPU(fpu != ¤t->thread.fpu); /* Almost certainly an anomaly */
|
||||
|
||||
- if (!use_eager_fpu() || !static_cpu_has(X86_FEATURE_FPU)) {
|
||||
- /* FPU state will be reallocated lazily at the first use. */
|
||||
- fpu__drop(fpu);
|
||||
- } else {
|
||||
- if (!fpu->fpstate_active) {
|
||||
- fpu__activate_curr(fpu);
|
||||
- user_fpu_begin();
|
||||
- }
|
||||
+ fpu__drop(fpu);
|
||||
+
|
||||
+ /*
|
||||
+ * Make sure fpstate is cleared and initialized.
|
||||
+ */
|
||||
+ if (static_cpu_has(X86_FEATURE_FPU)) {
|
||||
+ fpu__activate_curr(fpu);
|
||||
+ user_fpu_begin();
|
||||
copy_init_fpstate_to_fpregs();
|
||||
}
|
||||
}
|
||||
--
|
||||
2.10.2
|
||||
|
||||
18
PKGBUILD
18
PKGBUILD
|
|
@ -5,7 +5,7 @@
|
|||
pkgbase=linux # Build stock -ARCH kernel
|
||||
#pkgbase=linux-custom # Build kernel with a different name
|
||||
_srcname=linux-4.8
|
||||
pkgver=4.8.13
|
||||
pkgver=4.8.14
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.kernel.org/"
|
||||
|
|
@ -23,21 +23,21 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
|
|||
# standard config files for mkinitcpio ramdisk
|
||||
'linux.preset'
|
||||
'change-default-console-loglevel.patch'
|
||||
fix_race_condition_in_packet_set_ring.diff
|
||||
net_handle_no_dst_on_skb_in_icmp6_send.patch
|
||||
0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch
|
||||
)
|
||||
|
||||
sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
|
||||
'SKIP'
|
||||
'f0e2f7f738e1a639956e01ba7ef8d3df40ecb5c7586eb366bcd4af70049a7a3c'
|
||||
'efa9b7d87a6ca67426e3d7f206ac987eb7cb31602ad2011e81060626de790fcb'
|
||||
'SKIP'
|
||||
'2ac8818414beb7dbacbd3ad450c516e6ada804827132a7132f63b8189e5f5151'
|
||||
'41b9a64542befd2fea170776e8ec22a7d158dd3273633afc9b91662c448cd90a'
|
||||
'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
|
||||
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
|
||||
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
|
||||
'ad1ee95f906f88d31fcdb9273cd08e02e8eda177449f0c98dc1bff8cbf1483c2'
|
||||
'b595a1588bafb3d732841cd1b73633970706914f57f2d215c9f1494212d13989')
|
||||
'b595a1588bafb3d732841cd1b73633970706914f57f2d215c9f1494212d13989'
|
||||
'3e955e0f1aae96bb6c1507236adc952640c9bd0a134b9995ab92106a33dc02d9')
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
|
||||
|
|
@ -51,13 +51,13 @@ prepare() {
|
|||
# add upstream patch
|
||||
patch -p1 -i "${srcdir}/patch-${pkgver}"
|
||||
|
||||
# fix a race condition that allows to gain root
|
||||
# https://marc.info/?l=linux-netdev&m=148054660230570&w=2
|
||||
patch -p1 -i "${srcdir}/fix_race_condition_in_packet_set_ring.diff"
|
||||
|
||||
# https://bugzilla.kernel.org/show_bug.cgi?id=189851
|
||||
patch -p1 -i "${srcdir}/net_handle_no_dst_on_skb_in_icmp6_send.patch"
|
||||
|
||||
# Revert a commit that causes memory corruption in i686 chroots on our
|
||||
# build server ("valgrind bash" immediately crashes)
|
||||
patch -Rp1 -i "${srcdir}/0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch"
|
||||
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
From: Philip Pettersson <philip.pettersson@gmail.com>
|
||||
|
||||
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>
|
||||
---
|
||||
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 d2238b204691b8e4f2e3acb9bc167b553ba32d50..dd2332390c45bbff7c3fc5d259453f2e1ca352bf 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;
|
||||
}
|
||||
Loading…
Reference in New Issue