diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | fix_race_condition_in_packet_set_ring.diff | 84 |
3 files changed, 10 insertions, 98 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Sat Dec 10 01:14:01 UTC 2016 +# Tue Dec 20 06:30:48 UTC 2016 pkgbase = linux-lts-tomoyo - pkgver = 4.4.37 + pkgver = 4.4.39 pkgrel = 1 url = https://www.kernel.org/ arch = i686 @@ -15,18 +15,17 @@ pkgbase = linux-lts-tomoyo options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.37.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.37.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.39.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.39.sign source = config source = config.x86_64 source = 99-linux.hook source = linux-lts-tomoyo.preset source = change-default-console-loglevel.patch source = 0001-sdhci-revert.patch - source = fix_race_condition_in_packet_set_ring.diff sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 sha256sums = SKIP - sha256sums = 1dfa256765585bf85a17b7129d717761e12338c654a3a3a803f1d967ccfa54f3 + sha256sums = fc2b60d221aeaf3eafec4f36f299e4002be81da85117c3f59963fdcb6facb929 sha256sums = SKIP sha256sums = b11702727b1503e5a613946790978481d34d8ecc6870337fadd3ce1ef084a8e2 sha256sums = 68c7296ff2f5f55d69e83aa4d20f925df740b1eb1e6bdb0f13e8a170360ed09f @@ -34,7 +33,6 @@ pkgbase = linux-lts-tomoyo sha256sums = 9f6b59eccb57337034593a254e7a1bf106de8090c24e651ab728a00c37e00e80 sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375 - sha256sums = ad1ee95f906f88d31fcdb9273cd08e02e8eda177449f0c98dc1bff8cbf1483c2 pkgname = linux-lts-tomoyo pkgdesc = The Linux lts kernel with TOMOYO configuration @@ -44,7 +42,7 @@ pkgname = linux-lts-tomoyo depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = linux-tomoyo=4.4.37 + provides = linux-tomoyo=4.4.39 backup = etc/mkinitcpio.d/linux-lts-tomoyo.preset pkgname = linux-lts-tomoyo-headers @@ -8,7 +8,7 @@ pkgbase=linux-lts-tomoyo _srcname=linux-4.4 -pkgver=4.4.37 +pkgver=4.4.39 pkgrel=1 arch=('i686' 'x86_64') url="https://www.kernel.org/" @@ -24,20 +24,18 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign} # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'change-default-console-loglevel.patch' - '0001-sdhci-revert.patch' - 'fix_race_condition_in_packet_set_ring.diff') + '0001-sdhci-revert.patch') # https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'SKIP' - '1dfa256765585bf85a17b7129d717761e12338c654a3a3a803f1d967ccfa54f3' + 'fc2b60d221aeaf3eafec4f36f299e4002be81da85117c3f59963fdcb6facb929' 'SKIP' 'b11702727b1503e5a613946790978481d34d8ecc6870337fadd3ce1ef084a8e2' '68c7296ff2f5f55d69e83aa4d20f925df740b1eb1e6bdb0f13e8a170360ed09f' '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' '9f6b59eccb57337034593a254e7a1bf106de8090c24e651ab728a00c37e00e80' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' - 'ad1ee95f906f88d31fcdb9273cd08e02e8eda177449f0c98dc1bff8cbf1483c2') + '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds@linux-foundation.org> '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com> ) diff --git a/fix_race_condition_in_packet_set_ring.diff b/fix_race_condition_in_packet_set_ring.diff deleted file mode 100644 index 12048f611d1a..000000000000 --- a/fix_race_condition_in_packet_set_ring.diff +++ /dev/null @@ -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; - } |