diff options
author | dysphoria | 2016-12-10 01:14:20 +0000 |
---|---|---|
committer | dysphoria | 2016-12-10 01:14:20 +0000 |
commit | 8050cf84e6b7ec28d813e6c60bd088e250051b51 (patch) | |
tree | e121a3e6435f42086f36673a96d90850e7723d80 | |
parent | 47d70efbd6bc57255c82fcc3dfaea32689b581e2 (diff) | |
download | aur-8050cf84e6b7ec28d813e6c60bd088e250051b51.tar.gz |
[upd] bump to latest
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 99-linux.hook | 11 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | fix_race_condition_in_packet_set_ring.diff | 84 | ||||
-rw-r--r-- | linux-lts-tomoyo.install | 4 |
5 files changed, 125 insertions, 17 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Dec 1 19:31:37 UTC 2016 +# Sat Dec 10 01:14:01 UTC 2016 pkgbase = linux-lts-tomoyo - pkgver = 4.4.35 + pkgver = 4.4.37 pkgrel = 1 - url = http://www.kernel.org/ + url = https://www.kernel.org/ arch = i686 arch = x86_64 license = GPL2 @@ -15,22 +15,26 @@ 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.35.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.35.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 = 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 = 5d0cc352645127191767e1c33f78c48dfdee7022fe425639a4c95a901d5e5c77 + sha256sums = 1dfa256765585bf85a17b7129d717761e12338c654a3a3a803f1d967ccfa54f3 sha256sums = SKIP sha256sums = b11702727b1503e5a613946790978481d34d8ecc6870337fadd3ce1ef084a8e2 sha256sums = 68c7296ff2f5f55d69e83aa4d20f925df740b1eb1e6bdb0f13e8a170360ed09f + sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0 sha256sums = 9f6b59eccb57337034593a254e7a1bf106de8090c24e651ab728a00c37e00e80 sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375 + sha256sums = ad1ee95f906f88d31fcdb9273cd08e02e8eda177449f0c98dc1bff8cbf1483c2 pkgname = linux-lts-tomoyo pkgdesc = The Linux lts kernel with TOMOYO configuration @@ -40,7 +44,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.35 + provides = linux-tomoyo=4.4.37 backup = etc/mkinitcpio.d/linux-lts-tomoyo.preset pkgname = linux-lts-tomoyo-headers diff --git a/99-linux.hook b/99-linux.hook new file mode 100644 index 000000000000..9851151995bc --- /dev/null +++ b/99-linux.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = boot/vmlinuz-%PKGBASE% +Target = usr/lib/initcpio/* + +[Action] +Description = Updating %PKGBASE% initcpios +When = PostTransaction +Exec = /usr/bin/mkinitcpio -p %PKGBASE% @@ -1,17 +1,17 @@ # AUR/linux-lts-tomoyo PKGBUILD # Maintainer: dysphoria <> # -# arch/core/linux-lts $Id: PKGBUILD 282141 2016-11-27 21:42:11Z andyrtr $ +# arch/core/linux-lts $Id: PKGBUILD 282965 2016-12-09 19:16:43Z andyrtr $ # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgbase=linux-lts-tomoyo _srcname=linux-4.4 -pkgver=4.4.35 +pkgver=4.4.37 pkgrel=1 arch=('i686' 'x86_64') -url="http://www.kernel.org/" +url="https://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') @@ -19,20 +19,25 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign} https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign} # the main kernel config files 'config' 'config.x86_64' + # pacman hook for initramfs regeneration + '99-linux.hook' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'change-default-console-loglevel.patch' - '0001-sdhci-revert.patch') + '0001-sdhci-revert.patch' + 'fix_race_condition_in_packet_set_ring.diff') # https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'SKIP' - '5d0cc352645127191767e1c33f78c48dfdee7022fe425639a4c95a901d5e5c77' + '1dfa256765585bf85a17b7129d717761e12338c654a3a3a803f1d967ccfa54f3' 'SKIP' 'b11702727b1503e5a613946790978481d34d8ecc6870337fadd3ce1ef084a8e2' '68c7296ff2f5f55d69e83aa4d20f925df740b1eb1e6bdb0f13e8a170360ed09f' + '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' '9f6b59eccb57337034593a254e7a1bf106de8090c24e651ab728a00c37e00e80' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375') + '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' + 'ad1ee95f906f88d31fcdb9273cd08e02e8eda177449f0c98dc1bff8cbf1483c2') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds@linux-foundation.org> '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com> ) @@ -44,6 +49,10 @@ 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" + # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -140,6 +149,10 @@ _package() { -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + # install pacman hook for initramfs regeneration + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" | + install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook" + # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware diff --git a/fix_race_condition_in_packet_set_ring.diff b/fix_race_condition_in_packet_set_ring.diff new file mode 100644 index 000000000000..12048f611d1a --- /dev/null +++ b/fix_race_condition_in_packet_set_ring.diff @@ -0,0 +1,84 @@ +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; + } diff --git a/linux-lts-tomoyo.install b/linux-lts-tomoyo.install index 0db70b402af2..78315ad5c2a6 100644 --- a/linux-lts-tomoyo.install +++ b/linux-lts-tomoyo.install @@ -8,8 +8,6 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux${KERNEL_NAME} } post_upgrade() { @@ -20,8 +18,6 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux${KERNEL_NAME} if [ $(vercmp $2 3.13) -lt 0 ]; then echo ">>> WARNING: AT keyboard support is no longer built into the kernel." |