From patchwork Mon Mar 10 20:50:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 328798 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8122E2C0A62 for ; Tue, 11 Mar 2014 07:52:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755611AbaCJUvR (ORCPT ); Mon, 10 Mar 2014 16:51:17 -0400 Received: from mail-ee0-f48.google.com ([74.125.83.48]:49530 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755003AbaCJUvL (ORCPT ); Mon, 10 Mar 2014 16:51:11 -0400 Received: by mail-ee0-f48.google.com with SMTP id e51so3332213eek.7 for ; Mon, 10 Mar 2014 13:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xtE5gJukZL26+iCBk/2Ytw9T6PBtZHghQeJpA3u5Xxk=; b=e1Lt3ZK4fWkMlERxTksHs4hBGPKI3mt/IJBUtsLG5rGC8U6R4U9KD+oMIaO7qkseY2 kc2mq02TwsCUWcy0yTmoHHVjUmnYXsTCGB0sDGv+LvFcXRvqKllwne4Wo8pUcHt8ghCr ew99Hxs/tOI5tVodMRMMo1QpnSbQnvCIArMSD3b+X66lo3FzedEpWvymQcelQRMluXmU f8CG2xX+Jwc9cOSvQ9NKK4Z/Bb4QR3Z+hjH53QFZNOPdsZzF5cmrix/Kqw4VJEldcU3R Ylt/wHJ+INaSGhGyiDrd3QN8uo6UwsY5B518pZqKxCw8VPh5x0RfZzpU6H4VZ/7qV0vN yPYA== X-Received: by 10.14.6.195 with SMTP id 43mr5141815een.101.1394484669470; Mon, 10 Mar 2014 13:51:09 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-183.pools.arcor-ip.net. [82.83.251.183]) by mx.google.com with ESMTPSA id m42sm49162131eex.21.2014.03.10.13.51.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Mar 2014 13:51:08 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: David Miller , Florian Fainelli , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] net: phy: fix uninitalized WOL parameters in phy_ethtool_get_wol Date: Mon, 10 Mar 2014 21:50:59 +0100 Message-Id: <1394484661-4554-2-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1394484661-4554-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1394413270-7169-1-git-send-email-sebastian.hesselbarth@gmail.com> <1394484661-4554-1-git-send-email-sebastian.hesselbarth@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org phy_ethtool_get_wol is a helper to get current WOL settings from a phy device. When using this helper on a PHY without .get_wol callback, struct ethtool_wolinfo is never set-up correctly and may contain misleading information about WOL status. To fix this, always zero struct ethtool_wolinfo regardless of .get_wol callback availability. Signed-off-by: Sebastian Hesselbarth --- Changelog: v1->v2: - clear whole struct ethtool_wolinfo - check for non-NULL phy_device Cc: David Miller Cc: Florian Fainelli Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/phy/phy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 19c9eca0ef26..dae1fa8aa23d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1092,7 +1092,9 @@ EXPORT_SYMBOL(phy_ethtool_set_wol); void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) { - if (phydev->drv->get_wol) + memset(wol, 0, sizeof(*wol)); + + if (phydev && phydev->drv->get_wol) phydev->drv->get_wol(phydev, wol); } EXPORT_SYMBOL(phy_ethtool_get_wol);