netdev - Re: WoL broken in r8169.c since kernel 4.19

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190129073253.GJ27062@torres.zugschlus.de>
Date:   Tue, 29 Jan 2019 08:32:53 +0100
From:   Marc Haber <mh+netdev@...schlus.de>
To:     Heiner Kallweit <hkallweit1@...il.com>
Cc:     "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: WoL broken in r8169.c since kernel 4.19

On Mon, Jan 28, 2019 at 09:28:13PM +0100, Heiner Kallweit wrote:
> Because we're interested in file r8169.c only, you could test r8169.c
> from the oops-ing kernel on top of a working kernel version.

That's a really nice idea, and so obvious once one thinks about it.

According to bisect, the first bad commit is
19725496da5602b401eae389736ab00d1817e264

commit 19725496da5602b401eae389736ab00d1817e264
Merge: aea5f654e6b7 9981b4fb8684
Author: David S. Miller <davem@...emloft.net>
Date:   Tue Jul 24 19:21:58 2018 -0700

    Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

diff --cc drivers/net/ethernet/realtek/r8169.c
index 49a6e25ddc2b,eaedc11ed686..8ea1fa36ca43
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@@ -7396,9 -7734,24 +7396,8 @@@ static int rtl_init_one(struct pci_dev 
                return rc;
        }
  
-       /* override BIOS settings, use userspace tools to enable WOL */
-       __rtl8169_set_wol(tp, 0);
+       tp->saved_wolopts = __rtl8169_get_wol(tp);
  
 -      if (rtl_tbi_enabled(tp)) {
 -              tp->set_speed = rtl8169_set_speed_tbi;
 -              tp->get_link_ksettings = rtl8169_get_link_ksettings_tbi;
 -              tp->phy_reset_enable = rtl8169_tbi_reset_enable;
 -              tp->phy_reset_pending = rtl8169_tbi_reset_pending;
 -              tp->link_ok = rtl8169_tbi_link_ok;
 -              tp->do_ioctl = rtl_tbi_ioctl;
 -      } else {
 -              tp->set_speed = rtl8169_set_speed_xmii;
 -              tp->get_link_ksettings = rtl8169_get_link_ksettings_xmii;
 -              tp->phy_reset_enable = rtl8169_xmii_reset_enable;
 -              tp->phy_reset_pending = rtl8169_xmii_reset_pending;
 -              tp->link_ok = rtl8169_xmii_link_ok;
 -              tp->do_ioctl = rtl_xmii_ioctl;
 -      }
 -
        mutex_init(&tp->wk.mutex);
        u64_stats_init(&tp->rx_stats.syncp);
        u64_stats_init(&tp->tx_stats.syncp);

What confuses me here is the big part where the "-" is not in column 1, and
patch -R calls it garbage.

Greetings
Marc

-- 
-----------------------------------------------------------------------------
Marc Haber         | "I don't trust Computers. They | Mailadresse im Header
Leimen, Germany    |  lose things."    Winona Ryder | Fon: *49 6224 1600402
Nordisch by Nature |  How to make an American Quilt | Fax: *49 6224 1600421