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 6F55CC17441 for ; Mon, 11 Nov 2019 19:05:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41801222CE for ; Mon, 11 Nov 2019 19:05:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573499116; bh=wsDtpteRxJ9ePmyiYulL0S7/1MWNO3mYb0vesPf9eFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GPXZ+EO5D/LrRQfvJVOmwRti/PBiuLbPtsOEkH8ZHJ54sIUAK7lRlN9t3dI3QkbXU xF7NEtDr3F1u9pfMhUrlSmu0tDxSakvu7aP30guBomJ9wLZ5+Vn9PlrOQbcLgg4raK sfJum/kjcZhIgXqMBZZqmX7x8irv4BI1+K+kBTZI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729269AbfKKSkg (ORCPT ); Mon, 11 Nov 2019 13:40:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:59772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729268AbfKKSkf (ORCPT ); Mon, 11 Nov 2019 13:40:35 -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 B269120659; Mon, 11 Nov 2019 18:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497634; bh=wsDtpteRxJ9ePmyiYulL0S7/1MWNO3mYb0vesPf9eFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ACmP3TlCdOf4RGFrJZyrURKrDFvTh8hQAO5v+a1Dqc7Ix/Ji8pgRV79XlXDqZJET7 cHLR2Q0x4c9BqciNOq5HV+4se3ZhCgXmXZz7PrLom9fbxFu92WilagR6t7LSXn4msB YfqKGZ7yjYYmXZSoq6U3kq/6mgsn5lFRfRXIvAx8= 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 4.19 013/125] net: mscc: ocelot: fix NULL pointer on LAG slave removal Date: Mon, 11 Nov 2019 19:27:32 +0100 Message-Id: <20191111181441.401781032@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181438.945353076@linuxfoundation.org> References: <20191111181438.945353076@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 @@ -1550,7 +1550,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");