forked from AUR/linux-vfio
Update to 4.8.13-1
This commit is contained in:
Mark Weiman
parent
185890ceef
commit
a3822e9181
14
.SRCINFO
14
.SRCINFO
@ -1,7 +1,7 @@
|
||||
# Generated by mksrcinfo v8
|
||||
# Wed Nov 23 16:50:45 UTC 2016
|
||||
# Sat Dec 10 05:34:33 UTC 2016
|
||||
pkgbase = linux-vfio
|
||||
pkgver = 4.8.10
|
||||
pkgver = 4.8.13
|
||||
pkgrel = 1
|
||||
url = http://www.kernel.org/
|
||||
arch = i686
|
||||
@ -16,8 +16,8 @@ pkgbase = linux-vfio
|
||||
options = !strip
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.xz
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.sign
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.10.xz
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.10.sign
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.13.xz
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.13.sign
|
||||
source = config
|
||||
source = config.x86_64
|
||||
source = 99-linux.hook
|
||||
@ -25,9 +25,11 @@ pkgbase = linux-vfio
|
||||
source = change-default-console-loglevel.patch
|
||||
source = 0001-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
|
||||
source = 0001-i915-Add-module-option-to-support-VGA-arbiter-on-HD-.patch
|
||||
source = fix_race_condition_in_packet_set_ring.diff
|
||||
source = net_handle_no_dst_on_skb_in_icmp6_send.patch
|
||||
sha256sums = 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a
|
||||
sha256sums = SKIP
|
||||
sha256sums = d0ea1671c488957d7b1ef46a5107c47c16b37f2985ca7ee4c900ba0f89d40d3c
|
||||
sha256sums = f0e2f7f738e1a639956e01ba7ef8d3df40ecb5c7586eb366bcd4af70049a7a3c
|
||||
sha256sums = SKIP
|
||||
sha256sums = 01dd9e64e4d5c2188fcbb5a48375c987b16f28f383fb42559a34e1a2c5a8ef2a
|
||||
sha256sums = 4111ac3a567c2fccd56368c36dad29753c0df4eae721b4a475bae20dae76855a
|
||||
@ -36,6 +38,8 @@ pkgbase = linux-vfio
|
||||
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
|
||||
sha256sums = d36c589e3866535a9ac92911be64795967a05a6d300cc8b70abb79ea24b7b393
|
||||
sha256sums = 97c6eaff4dfd2059835351afa9466b43569f3eb45f6c57094f57a3f3fad7ec85
|
||||
sha256sums = 68067f9be72c0b7d0fe78f00514ad12cab597bfd63083ff4d9d2745c8bd3b616
|
||||
sha256sums = 144bb67184d7e1fda1a254b5364f72465e3070179713071c72c18618e7b6218a
|
||||
|
||||
pkgname = linux-vfio
|
||||
pkgdesc = The Linux kernel and modules with patches to enable GPU passthrough with KVM
|
||||
|
||||
20
PKGBUILD
20
PKGBUILD
@ -3,7 +3,7 @@
|
||||
|
||||
pkgbase=linux-vfio
|
||||
_srcname=linux-4.8
|
||||
pkgver=4.8.10
|
||||
pkgver=4.8.13
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.kernel.org/"
|
||||
@ -22,10 +22,13 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
|
||||
'linux.preset'
|
||||
'change-default-console-loglevel.patch'
|
||||
'0001-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch'
|
||||
'0001-i915-Add-module-option-to-support-VGA-arbiter-on-HD-.patch')
|
||||
'0001-i915-Add-module-option-to-support-VGA-arbiter-on-HD-.patch'
|
||||
'fix_race_condition_in_packet_set_ring.diff'
|
||||
'net_handle_no_dst_on_skb_in_icmp6_send.patch'
|
||||
)
|
||||
sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
|
||||
'SKIP'
|
||||
'd0ea1671c488957d7b1ef46a5107c47c16b37f2985ca7ee4c900ba0f89d40d3c'
|
||||
'f0e2f7f738e1a639956e01ba7ef8d3df40ecb5c7586eb366bcd4af70049a7a3c'
|
||||
'SKIP'
|
||||
'01dd9e64e4d5c2188fcbb5a48375c987b16f28f383fb42559a34e1a2c5a8ef2a'
|
||||
'4111ac3a567c2fccd56368c36dad29753c0df4eae721b4a475bae20dae76855a'
|
||||
@ -33,7 +36,9 @@ sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
|
||||
'99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9'
|
||||
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
|
||||
'd36c589e3866535a9ac92911be64795967a05a6d300cc8b70abb79ea24b7b393'
|
||||
'97c6eaff4dfd2059835351afa9466b43569f3eb45f6c57094f57a3f3fad7ec85')
|
||||
'97c6eaff4dfd2059835351afa9466b43569f3eb45f6c57094f57a3f3fad7ec85'
|
||||
'68067f9be72c0b7d0fe78f00514ad12cab597bfd63083ff4d9d2745c8bd3b616'
|
||||
'144bb67184d7e1fda1a254b5364f72465e3070179713071c72c18618e7b6218a')
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
|
||||
@ -47,6 +52,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"
|
||||
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
||||
|
||||
85
fix_race_condition_in_packet_set_ring.diff
Normal file
85
fix_race_condition_in_packet_set_ring.diff
Normal file
@ -0,0 +1,85 @@
|
||||
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;
|
||||
}
|
||||
|
||||
69
net_handle_no_dst_on_skb_in_icmp6_send.patch
Normal file
69
net_handle_no_dst_on_skb_in_icmp6_send.patch
Normal file
@ -0,0 +1,69 @@
|
||||
From 79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2 Mon Sep 17 00:00:00 2001
|
||||
From: David Ahern <dsa@cumulusnetworks.com>
|
||||
Date: Sun, 27 Nov 2016 18:52:53 -0800
|
||||
Subject: [PATCH] net: handle no dst on skb in icmp6_send
|
||||
|
||||
Andrey reported the following while fuzzing the kernel with syzkaller:
|
||||
|
||||
kasan: CONFIG_KASAN_INLINE enabled
|
||||
kasan: GPF could be caused by NULL-ptr deref or user memory access
|
||||
general protection fault: 0000 [#1] SMP KASAN
|
||||
Modules linked in:
|
||||
CPU: 0 PID: 3859 Comm: a.out Not tainted 4.9.0-rc6+ #429
|
||||
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
|
||||
task: ffff8800666d4200 task.stack: ffff880067348000
|
||||
RIP: 0010:[<ffffffff833617ec>] [<ffffffff833617ec>]
|
||||
icmp6_send+0x5fc/0x1e30 net/ipv6/icmp.c:451
|
||||
RSP: 0018:ffff88006734f2c0 EFLAGS: 00010206
|
||||
RAX: ffff8800666d4200 RBX: 0000000000000000 RCX: 0000000000000000
|
||||
RDX: 0000000000000000 RSI: dffffc0000000000 RDI: 0000000000000018
|
||||
RBP: ffff88006734f630 R08: ffff880064138418 R09: 0000000000000003
|
||||
R10: dffffc0000000000 R11: 0000000000000005 R12: 0000000000000000
|
||||
R13: ffffffff84e7e200 R14: ffff880064138484 R15: ffff8800641383c0
|
||||
FS: 00007fb3887a07c0(0000) GS:ffff88006cc00000(0000) knlGS:0000000000000000
|
||||
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
|
||||
CR2: 0000000020000000 CR3: 000000006b040000 CR4: 00000000000006f0
|
||||
Stack:
|
||||
ffff8800666d4200 ffff8800666d49f8 ffff8800666d4200 ffffffff84c02460
|
||||
ffff8800666d4a1a 1ffff1000ccdaa2f ffff88006734f498 0000000000000046
|
||||
ffff88006734f440 ffffffff832f4269 ffff880064ba7456 0000000000000000
|
||||
Call Trace:
|
||||
[<ffffffff83364ddc>] icmpv6_param_prob+0x2c/0x40 net/ipv6/icmp.c:557
|
||||
[< inline >] ip6_tlvopt_unknown net/ipv6/exthdrs.c:88
|
||||
[<ffffffff83394405>] ip6_parse_tlv+0x555/0x670 net/ipv6/exthdrs.c:157
|
||||
[<ffffffff8339a759>] ipv6_parse_hopopts+0x199/0x460 net/ipv6/exthdrs.c:663
|
||||
[<ffffffff832ee773>] ipv6_rcv+0xfa3/0x1dc0 net/ipv6/ip6_input.c:191
|
||||
...
|
||||
|
||||
icmp6_send / icmpv6_send is invoked for both rx and tx paths. In both
|
||||
cases the dst->dev should be preferred for determining the L3 domain
|
||||
if the dst has been set on the skb. Fallback to the skb->dev if it has
|
||||
not. This covers the case reported here where icmp6_send is invoked on
|
||||
Rx before the route lookup.
|
||||
|
||||
Fixes: 5d41ce29e ("net: icmp6_send should use dst dev to determine L3 domain")
|
||||
Reported-by: Andrey Konovalov <andreyknvl@google.com>
|
||||
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
net/ipv6/icmp.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
|
||||
index 7370ad2..2772004 100644
|
||||
--- a/net/ipv6/icmp.c
|
||||
+++ b/net/ipv6/icmp.c
|
||||
@@ -447,8 +447,10 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,
|
||||
|
||||
if (__ipv6_addr_needs_scope_id(addr_type))
|
||||
iif = skb->dev->ifindex;
|
||||
- else
|
||||
- iif = l3mdev_master_ifindex(skb_dst(skb)->dev);
|
||||
+ else {
|
||||
+ dst = skb_dst(skb);
|
||||
+ iif = l3mdev_master_ifindex(dst ? dst->dev : skb->dev);
|
||||
+ }
|
||||
|
||||
/*
|
||||
* Must not send error if the source does not uniquely
|
||||
|
||||
Loading…
Reference in New Issue
Block a user