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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 CF6C9C17445 for ; Mon, 11 Nov 2019 19:02:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E111222CD for ; Mon, 11 Nov 2019 19:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498966; bh=uV9+DRN50uvOFyrygjJ7uUCJZh1siGJa4t9SilKI5hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SWL8+uZkCgfcLnRvytw6Ks4tfGcrV/si0kzafPhmJVczw4DVO7lWXzBe5PGZjnh/Q tOswBQox39EffX0Q1JsWU2uro1RBj7dDnYuOdNhkbElsc0eFd2BMGkaThVJj5wy8QX qNs69+y6wonCnD+buWCWBg/xjan+9QIpTW3DDbyE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730180AbfKKSru (ORCPT ); Mon, 11 Nov 2019 13:47:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:40754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729747AbfKKSrt (ORCPT ); Mon, 11 Nov 2019 13:47:49 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 3035720674; Mon, 11 Nov 2019 18:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498068; bh=uV9+DRN50uvOFyrygjJ7uUCJZh1siGJa4t9SilKI5hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gb2GYiaje7udQ+0lqOHWWlZcz1DsMN08tAgbf9SfvDhwUjKOc2ANCmaVYgeBZyrjq IE90aVVlQ/Pxavep4To7Wk4DTWOUmcorzrYj14PASEaWCrNJpheAf7nCKMQNk46IwC d4Ljy7v4DFQDxwOla4rgZreKUmz8D7CN3vXB9uwk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Claudiu Manoil , Vladimir Oltean , "David S. Miller" Subject: [PATCH 5.3 014/193] net: mscc: ocelot: fix NULL pointer on LAG slave removal Date: Mon, 11 Nov 2019 19:26:36 +0100 Message-Id: <20191111181501.032302823@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Claudiu Manoil [ Upstream commit 3b3eed8eec47259939ee6c3d58aea1c311ddee3b ] lag_upper_info may be NULL on slave removal. Fixes: dc96ee3730fc ("net: mscc: ocelot: add bonding support") Signed-off-by: Claudiu Manoil Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mscc/ocelot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -1543,7 +1543,8 @@ static int ocelot_netdevice_event(struct struct netdev_lag_upper_info *lag_upper_info = info->upper_info; struct netlink_ext_ack *extack; - if (lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) { + if (lag_upper_info && + lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) { extack = netdev_notifier_info_to_extack(&info->info); NL_SET_ERR_MSG_MOD(extack, "LAG device using unsupported Tx type");