Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755886AbbDNPWK (ORCPT ); Tue, 14 Apr 2015 11:22:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52032 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753922AbbDNPV7 (ORCPT ); Tue, 14 Apr 2015 11:21:59 -0400 From: Honggang Li To: roland@kernel.org, sean.hefty@intel.com, hal.rosenstock@gmail.com, kaber@trash.net, davem@davemloft.net, alex.estrin@intel.com, dledford@redhat.com, edumazet@google.com, erezsh@mellanox.com, nicolas.dichtel@6wind.com, maheshb@google.com, jbenc@redhat.com, ebiederm@xmission.com, elfring@users.sourceforge.net, f.fainelli@gmail.com, linux@roeck-us.net, andrew@lunn.ch, sfeldma@gmail.com, alexander.h.duyck@intel.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Honggang Li Subject: [PATCH linux-next 3/4] macvlan: fix possible NULL pointer dereference in macvlan_dev_get_iflink Date: Tue, 14 Apr 2015 23:20:16 +0800 Message-Id: <1429024817-21561-4-git-send-email-honli@redhat.com> In-Reply-To: <1429024817-21561-1-git-send-email-honli@redhat.com> References: <1429024817-21561-1-git-send-email-honli@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 843 Lines: 28 Signed-off-by: Honggang Li --- drivers/net/macvlan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index b227a13..1e59f39 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -998,7 +998,9 @@ static int macvlan_dev_get_iflink(const struct net_device *dev) { struct macvlan_dev *vlan = netdev_priv(dev); - return vlan->lowerdev->ifindex; + if (vlan && vlan->lowerdev) + return vlan->lowerdev->ifindex; + return 0; } static const struct ethtool_ops macvlan_ethtool_ops = { -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/