Received: by 10.192.165.156 with SMTP id m28csp1076272imm; Wed, 11 Apr 2018 11:59:52 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/VYJnvhkSWwZTzEyqqBcWA8FKdMHPOjfvGMw77vWyXkV1CB/7dqAGQVA5ngdF5E80GR5Nn X-Received: by 10.98.16.28 with SMTP id y28mr5074580pfi.122.1523473192769; Wed, 11 Apr 2018 11:59:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523473192; cv=none; d=google.com; s=arc-20160816; b=fMOkefP97RA2iANBG0xtjTzUOo8moACrfJ7dP4MFIaTLOjrzS2iPyCnaQonfOuUf8W NEiZFqYg5iCxzVnA+eKB4lIkkBqDRbHzb+9Bhcs4utIkECPsfxJ5OAXVWd1DBBmXAodp 3dcBjePIz0SwbfXly/SuOfLq1sLvdshNiOmDBVeQXBonkCsbCbfoa0PAkSFmnbze33u2 AkmokR3OPJycHH1Fojo+WF6E3BW/1Tzr0UQgewf/9E9m+g286HjN8gRtrMT45gy11Z4f VreVa5tUDbJHUmDfRJTSum8MKLzVRNEYfce3UL8TdyIEFTLNVKsZt/RYA7ImtFEyKvPM 9xoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=c2STYCbRPOaJyC/fDelx33Ab5mW9k7xkAr4ryrjneiw=; b=R1LtMDr3VogTmTP4fOsmfBGwoYGbiqO3PuoBm/GJShwwj5GSfA4ldyt8TXS9g1aaUh WTIesi7xLD2esgbfWP6V5AbT17ksmb1CqPywboTU7lwRU2bdcVAO8yFD8Gcgha0rwpH3 vYxTwU6LwievplANItnpcZA+2WxJm2IoK7SSIjTs4KdzATGL96hgjARNGTVvI4DX+oXo /wCta498Lup1tw/JceQVJgbb7AZH67DhbQVf3HR2YfOduAC50FK0qjM92SnaAtO6P2h8 ssUBl9p9Qwz3y83+LQDLaB189MlfCefVWG70IB+2BjdAw2v8+tlildTsK0/inkZOjQ1F LK9A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p7-v6si38928pll.476.2018.04.11.11.59.16; Wed, 11 Apr 2018 11:59:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933809AbeDKSzy (ORCPT + 99 others); Wed, 11 Apr 2018 14:55:54 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:35586 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933798AbeDKSzv (ORCPT ); Wed, 11 Apr 2018 14:55:51 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id ABEFC99F; Wed, 11 Apr 2018 18:55:50 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ido Schimmel , Jiri Pirko , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 076/310] mlxsw: spectrum: Avoid possible NULL pointer dereference Date: Wed, 11 Apr 2018 20:33:35 +0200 Message-Id: <20180411183625.582544217@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ido Schimmel [ Upstream commit c0e01eac7ada785fdeaea1ae5476ec1cf3b00374 ] In case we got an FDB notification for a port that doesn't exist we execute an FDB entry delete to prevent it from re-appearing the next time we poll for notifications. If the operation failed we would trigger a NULL pointer dereference as 'mlxsw_sp_port' is NULL. Fix it by reporting the error using the underlying bus device instead. Fixes: 12f1501e7511 ("mlxsw: spectrum: remove FDB entry in case we get unknown object notification") Signed-off-by: Ido Schimmel Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -1448,8 +1448,7 @@ do_fdb_op: err = mlxsw_sp_port_fdb_uc_op(mlxsw_sp, local_port, mac, fid, adding, true); if (err) { - if (net_ratelimit()) - netdev_err(mlxsw_sp_port->dev, "Failed to set FDB entry\n"); + dev_err_ratelimited(mlxsw_sp->bus_info->dev, "Failed to set FDB entry\n"); return; } @@ -1509,8 +1508,7 @@ do_fdb_op: err = mlxsw_sp_port_fdb_uc_lag_op(mlxsw_sp, lag_id, mac, fid, lag_vid, adding, true); if (err) { - if (net_ratelimit()) - netdev_err(mlxsw_sp_port->dev, "Failed to set FDB entry\n"); + dev_err_ratelimited(mlxsw_sp->bus_info->dev, "Failed to set FDB entry\n"); return; }