From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF0B9C282CE for ; Mon, 11 Feb 2019 15:55:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84A26222AC for ; Mon, 11 Feb 2019 15:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549900519; bh=Dr1l0440dgOJDXyj97wxxFlq0Y5GM7D36xZz+qeN1KY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fr5rxFA5GDrdZzJEjIE1aH5tTHIXslWS7kY97JM+UDe6N3Jdi84QgHtU/vbblOuyq tkFLxsOgTFox7VDty4oFOoWHgI87SjcC/mHSleLOqsdq17E5+ovUYwQ6AVWaKnOkQe vLio9RVJveQL+7mkJYnQdTDq5PmTHj0ayf/ynII0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730978AbfBKOfM (ORCPT ); Mon, 11 Feb 2019 09:35:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:43776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730434AbfBKOfL (ORCPT ); Mon, 11 Feb 2019 09:35:11 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C379F204EC; Mon, 11 Feb 2019 14:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895711; bh=Dr1l0440dgOJDXyj97wxxFlq0Y5GM7D36xZz+qeN1KY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sTJRTwDQ/72xO/CKx9RZVUjsTz36jH0i3vNGofSUBBxNme1zfWOuS2uPlO0MCRxak C8Z94mt07iEScN3gTM/aSFXs7Ba0ROrq8uJijdbzlB7u/apSGkYUWSxyCGIK6GEebr p7s2azDJV5ugKMJP/syWMMsCS/8vVhy684s6j4V4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Florian Fainelli , Vivien Didelot , "David S. Miller" Subject: [PATCH 4.20 297/352] net: dsa: Fix NULL checking in dsa_slave_set_eee() Date: Mon, 11 Feb 2019 15:18:44 +0100 Message-Id: <20190211141905.778484294@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter [ Upstream commit 00670cb8a73b10b10d3c40f045c15411715e4465 ] This function can't succeed if dp->pl is NULL. It will Oops inside the call to return phylink_ethtool_get_eee(dp->pl, e); Fixes: 1be52e97ed3e ("dsa: slave: eee: Allow ports to use phylink") Signed-off-by: Dan Carpenter Reviewed-by: Florian Fainelli Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/dsa/slave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -639,7 +639,7 @@ static int dsa_slave_set_eee(struct net_ int ret; /* Port's PHY and MAC both need to be EEE capable */ - if (!dev->phydev && !dp->pl) + if (!dev->phydev || !dp->pl) return -ENODEV; if (!ds->ops->set_mac_eee) @@ -659,7 +659,7 @@ static int dsa_slave_get_eee(struct net_ int ret; /* Port's PHY and MAC both need to be EEE capable */ - if (!dev->phydev && !dp->pl) + if (!dev->phydev || !dp->pl) return -ENODEV; if (!ds->ops->get_mac_eee)