net: phy: phylink: fix uninitialized variable in phylink_get_mac_state [Linux 5.0]

This Linux kernel change "net: phy: phylink: fix uninitialized variable in phylink_get_mac_state" is included in the Linux 5.0 release. This change is authored by Heiner Kallweit <hkallweit1 [at] gmail.com> on Tue Feb 26 19:29:22 2019 +0100. The commit for this change in Linux stable tree is d25ed41 (patch).

net: phy: phylink: fix uninitialized variable in phylink_get_mac_state

When debugging an issue I found implausible values in state->pause.
Reason in that state->pause isn't initialized and later only single
bits are changed. Also the struct itself isn't initialized in
phylink_resolve(). So better initialize state->pause and other
not yet initialized fields.

v2:
- use right function name in subject
v3:
- initialize additional fields

Fixes: 9525ae83959b ("phylink: add phylink infrastructure")
Signed-off-by: Heiner Kallweit <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

There are 4 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/phy/phylink.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 9388032..85987aa 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -320,6 +320,10 @@ static int phylink_get_mac_state(struct phylink *pl, struct phylink_link_state *
    linkmode_zero(state->lp_advertising);
    state->interface = pl->link_config.interface;
    state->an_enabled = pl->link_config.an_enabled;
+   state->speed = SPEED_UNKNOWN;
+   state->duplex = DUPLEX_UNKNOWN;
+   state->pause = MLO_PAUSE_NONE;
+   state->an_complete = 0;
    state->link = 1;

    return pl->ops->mac_link_state(ndev, state);

Leave a Reply

Your email address will not be published. Required fields are marked *