From patchwork Fri Feb 15 20:16:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043165 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GVfMulsd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441PgT4bfNz9sML for ; Sat, 16 Feb 2019 07:17:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391190AbfBOURH (ORCPT ); Fri, 15 Feb 2019 15:17:07 -0500 Received: from mail-yw1-f65.google.com ([209.85.161.65]:42725 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391148AbfBOURG (ORCPT ); Fri, 15 Feb 2019 15:17:06 -0500 Received: by mail-yw1-f65.google.com with SMTP id v201so4169604ywa.9 for ; Fri, 15 Feb 2019 12:17:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Deug8ONmxRdfpX7zf2YuILPdGz4kGSrjD2ZRviXD9kY=; b=GVfMulsdQ6N/wN1nbop4dcndnirPYEQ+C0GAm1HMLS63Bq1IwAGSt8aAKFgbscnZM5 e99Viuwct6b7/QPOXlYHFnS5SRZrOPIoGFIwoYrTdr9oem0folK4z0mJPACgqZ8CQHQR zt3jFrENsDI4jY+jeNzan/Yjo98c4ewGIAnWABsPWfxpCYnZekDtweG6q6zAikjY9WnQ LM/TvIZZOn5Un5el0RteVNEPeIrfBvVITAV0Vvq7bNjHDVYzY9UPJcR/KYwIhkoiEaMD IY3jxXtBbQ19iuqEbhn6RE4tRLmHLeAHY2ucna4nBQeIPz0t/IAL58FGRb9JLKySwQ97 +r3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Deug8ONmxRdfpX7zf2YuILPdGz4kGSrjD2ZRviXD9kY=; b=XE3iZePOO+g4BJc+1La94IvpdhRoT6v/OwHdV4dx1usPgqSiu2YNeGGT/ueJ6ZVSLO F6HE2/iUNYTtrgDyeiUEC1IYSamN1TQgZ6O57anML0jKvMv37MErvWELcHF+I0UPdWij kcMoaUVtJdeUNQNLGxnOdGlD+Ou3/TnEivRJzplWxQNgPSxDi2T2q0CBcYHYvtaGiKL9 DIkrJev+lcIbdwFQFbulAGeNbFepmPG9koRyLUqGAXlb9LNWh5wskv0DTxGG3/BNlQ14 cMBBho03TF9u8wl/ZEf5VXYXXGzIsbY+fAmGVrb9NPOiYVFGsJbECP67muor4jIfm9Ie lKzQ== X-Gm-Message-State: AHQUAub40ZjuxCXeF9d3j8EFx2leQLbFiWqpR4ZEUOue9KfNFpy2stYM 7n1r2uWmBK/3kXmhxOAYPL1GI+eE X-Google-Smtp-Source: AHgI3Iag7ogMD7EJuSsbI/ns7ys93GuWDvKoieirsoKGZPhBH+sKfURk/YCfrJtSOBBR8qALIqFo+Q== X-Received: by 2002:a81:af43:: with SMTP id x3mr9663524ywj.281.1550261824866; Fri, 15 Feb 2019 12:17:04 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id y67sm2889574ywf.89.2019.02.15.12.17.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 12:17:04 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, vivien.didelot@gmail.com, Florian Fainelli Subject: [PATCH net 4/5] net: dsa: bcm_sf2: Do not assume DSA master supports WoL Date: Fri, 15 Feb 2019 12:16:52 -0800 Message-Id: <20190215201653.20988-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190215201653.20988-1-f.fainelli@gmail.com> References: <20190215201653.20988-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We assume in the bcm_sf2 driver that the DSA master network device supports ethtool_ops::{get,set}_wol operations, which is not a given. Avoid de-referencing potentially non-existent function pointers and check them as we should. Fixes: 96e65d7f3f88 ("net: dsa: bcm_sf2: add support for Wake-on-LAN") Signed-off-by: Florian Fainelli --- drivers/net/dsa/bcm_sf2.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 17ec32b0a1cc..14138d423cf1 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -726,10 +726,11 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port, { struct net_device *p = ds->ports[port].cpu_dp->master; struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); - struct ethtool_wolinfo pwol; + struct ethtool_wolinfo pwol = { }; /* Get the parent device WoL settings */ - p->ethtool_ops->get_wol(p, &pwol); + if (p->ethtool_ops->get_wol) + p->ethtool_ops->get_wol(p, &pwol); /* Advertise the parent device supported settings */ wol->supported = pwol.supported; @@ -750,9 +751,10 @@ static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port, struct net_device *p = ds->ports[port].cpu_dp->master; struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); s8 cpu_port = ds->ports[port].cpu_dp->index; - struct ethtool_wolinfo pwol; + struct ethtool_wolinfo pwol = { }; - p->ethtool_ops->get_wol(p, &pwol); + if (p->ethtool_ops->get_wol) + p->ethtool_ops->get_wol(p, &pwol); if (wol->wolopts & ~pwol.supported) return -EINVAL;