diff options
| -rw-r--r-- | kernel.spec | 13 | ||||
| -rw-r--r-- | net-lan78xx-fix-rx-handling-before-first-packet-is-send.patch | 97 | ||||
| -rwxr-xr-x | scripts/stable-update.sh | 15 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 7 insertions, 120 deletions
diff --git a/kernel.spec b/kernel.spec index b48b47d8d..1361ad2b3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 11 +%define stable_update 12 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -615,9 +615,6 @@ Patch330: bcm2837-rpi-initial-3plus-support.patch Patch332: bcm2837-enable-pmu.patch Patch333: bcm2837-lan78xx-fixes.patch -# https://patchwork.kernel.org/patch/10547897/ -Patch334: net-lan78xx-fix-rx-handling-before-first-packet-is-send.patch - # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -674,9 +671,6 @@ Patch523: 0001-xfs-More-robust-inode-extent-count-validation.patch # rhbz 1597333 # Patch526: xhci-Fix-perceived-dead-host-due-to-runtime-suspend-.patch -# rhbz 1602971 -Patch529: ext4-fix-false-negative-and-false-positives.patch - # CVE-2018-14678 rhbz 1608559 1608560 Patch530: xsa274-linux-4_17.patch @@ -1929,6 +1923,11 @@ fi # # %changelog +* Fri Aug 03 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.12-200 +- Linux v4.17.12 +- Fixes CVE-2018-14734 (rhbz 1611005 1611007) +- Fixes (rhbz 1609932) + * Wed Aug 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> - Add fix for lan78xx RX packets (Raspberry Pi 3B+) diff --git a/net-lan78xx-fix-rx-handling-before-first-packet-is-send.patch b/net-lan78xx-fix-rx-handling-before-first-packet-is-send.patch deleted file mode 100644 index d4726ad8f..000000000 --- a/net-lan78xx-fix-rx-handling-before-first-packet-is-send.patch +++ /dev/null @@ -1,97 +0,0 @@ -From patchwork Sat Jul 28 07:52:10 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Stefan Wahren <stefan.wahren@i2se.com> -X-Patchwork-Id: 10547897 -Return-Path: <linux-usb-owner@kernel.org> -Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org - [172.30.200.125]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E30E13BF - for <patchwork-linux-usb@patchwork.kernel.org>; - Sat, 28 Jul 2018 07:53:14 +0000 (UTC) -Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) - by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0007D28505 - for <patchwork-linux-usb@patchwork.kernel.org>; - Sat, 28 Jul 2018 07:53:13 +0000 (UTC) -Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) - id E44B22B5DF; Sat, 28 Jul 2018 07:53:13 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on - pdx-wl-mail.web.codeaurora.org -X-Spam-Level: -X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, - RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5462E28505 - for <patchwork-linux-usb@patchwork.kernel.org>; - Sat, 28 Jul 2018 07:53:13 +0000 (UTC) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1726185AbeG1JSf (ORCPT - <rfc822;patchwork-linux-usb@patchwork.kernel.org>); - Sat, 28 Jul 2018 05:18:35 -0400 -Received: from mout.kundenserver.de ([212.227.17.10]:52173 "EHLO - mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726061AbeG1JSf (ORCPT - <rfc822;linux-usb@vger.kernel.org>); Sat, 28 Jul 2018 05:18:35 -0400 -Received: from localhost.localdomain ([37.4.249.97]) by - mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) - id 0MUVwx-1fbNw12XvX-00REnE; Sat, 28 Jul 2018 09:52:50 +0200 -From: Stefan Wahren <stefan.wahren@i2se.com> -To: Woojung Huh <woojung.huh@microchip.com>, - UNGLinuxDriver@microchip.com, - "David S. Miller" <davem@davemloft.net> -Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, - Dave Stevenson <dave.stevenson@raspberrypi.org>, - netdev@vger.kernel.org, linux-usb@vger.kernel.org, - Stefan Wahren <stefan.wahren@i2se.com> -Subject: [PATCH] net: lan78xx: fix rx handling before first packet is send -Date: Sat, 28 Jul 2018 09:52:10 +0200 -Message-Id: <1532764330-14522-1-git-send-email-stefan.wahren@i2se.com> -X-Mailer: git-send-email 2.7.4 -X-Provags-ID: V03:K1:1UgD7xV2Hs3djVASkjGZexXrelNVV9KQ4W/KMZ/6ZAjOD8iCVVb - 8jgtNmA1TZYvTOLPwIOhlB8fkrx6AkSXGQRQtE1q6zNBYDYszenIppRha2tGTSDIR8dnhZs - tmeCWOtaIFiYiDYuCEtYrYgFELx1btCiQS8Ibc237s0SLbaPNnQ369IwfgO4dQdcdOZuixw - Ugo4KTjNh2qR2Hp4FWD7g== -X-UI-Out-Filterresults: notjunk:1;V01:K0:JyYP1ZeZOl0=:98L7zdWnTjAX3Fa+4Pqc+f - T3TiXkUfXJyEJ+QxnkwcBp0LXo+7/LWQ7h4/cZJnHF7Uo8bsvljCcRVGmMhx5Cy46MtNZvUED - CW5cOvXktUAucStGptcPE+qDnRJ6ruaSzDuwc/A7tBqW518YK/KyASr+EwASjmyvcqOYMVd6M - ZAP4in8S1PqQ98w3Ya3wxpz4heiv9J6xbs1HGSjNCBs0T80zp9ufdlNqCz7QBJ/07LlheZPkh - TeMhKHNUoaqIq2wfm/LT2+O9oO4hBPB1kGcwj50z5oPO86MXeJWtoUx8JKU8l+56tWQydlhc7 - PYFqGBnCG+krEz6Eoh1CM+KJIh1CrmlteojK38ny/GllmThwPLrXsVrVaUPoZ38gduQz3Ug5+ - gyOA7CU3L/eamlSo1XevvLRdv8ObDF5V82qTvBANHqEg5ZAW0MIe/hhIGKArtR1jpXSOan4M6 - lY6ejQh3ZBtliMvpjoPCWh3ivl7hQpi+Cm4cQrJeq1DuB1MbGJQfZXCieSBUJkhi7y8YLzuN6 - N2QlDoLCXzmrz2N2Fcx69oKVIKOfWVk9wgXlYKNG7Ovd8KT0jVwG8WpWRKhRTwsJYWvRY9+Rc - MA7jSxJSgtBSA/cs12dACWJ8rkaA9uezD1g8YRFSJDf/IXXUqWmONuPGAh89RtCr+lMQne/oY - da1rqaBklRMhegBeJ1yrYFkyuyoWztMMC7JbjrM7lMHkOfhih49WDkWBTGZvdEwTc+Ps= -Sender: linux-usb-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-usb.vger.kernel.org> -X-Mailing-List: linux-usb@vger.kernel.org -X-Virus-Scanned: ClamAV using ClamSMTP - -As long the bh tasklet isn't scheduled once, no packet from the rx path -will be handled. Since the tx path also schedule the same tasklet -this situation only persits until the first packet transmission. -So fix this issue by scheduling the tasklet after link reset. - -Link: https://github.com/raspberrypi/linux/issues/2617 -Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet") -Suggested-by: Floris Bos <bos@je-eigen-domein.nl> -Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> ---- - drivers/net/usb/lan78xx.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index ed10d49..aeca484 100644 ---- a/drivers/net/usb/lan78xx.c -+++ b/drivers/net/usb/lan78xx.c -@@ -1242,6 +1242,8 @@ static int lan78xx_link_reset(struct lan78xx_net *dev) - mod_timer(&dev->stat_monitor, - jiffies + STAT_UPDATE_TIMER); - } -+ -+ tasklet_schedule(&dev->bh); - } - - return ret; diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index 2ea5fb78b..eefd9a96d 100755 --- a/scripts/stable-update.sh +++ b/scripts/stable-update.sh @@ -42,21 +42,6 @@ if [ ! -f patch-$1.xz ]; then fi fi -if [ ! -f "patch-$1.sign" ]; then - wget "https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-$1.sign" - if [ ! $? -eq 0 ]; then - echo "Signature download failed" - exit 1 - fi -fi - -xzcat "patch-$1.xz" | gpg2 --verify "patch-$1.sign" - -if [ ! $? -eq 0 ]; then - echo "Patch file has invalid or untrusted signature!" - echo "See https://www.kernel.org/category/signatures.html" - exit 1 -fi - grep $1 sources &> /dev/null if [ ! $? -eq 0 ]; then fedpkg upload patch-$1.xz @@ -1,2 +1,2 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db -SHA512 (patch-4.17.11.xz) = 6cab8f1aecceb0491dca25afa088f9601178c8dfec51551afd34e219600bba54f65f929d9a10948cdb5595e339e096473127b55b1142e6dbe9a818149bec307d +SHA512 (patch-4.17.12.xz) = 516270daaa65a0f40bf6202909fc1950a8c723b77d5a54089a72eb664c3708ece050c938230cdd3b1b3e281d73c1c5e909def5fe1e0c8ddecbf9fbd43713a3aa |