From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laszlo Toth Subject: [PATCH] net: bridge: add missing NULL checks Date: Sun, 8 Apr 2018 19:49:34 +0200 Message-ID: <20180408174934.GA3895@laszlth> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: bridge@lists.linux-foundation.org, netdev@vger.kernel.org To: Stephen Hemminger , "David S. Miller" Return-path: Received: from mail-wr0-f194.google.com ([209.85.128.194]:44765 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751601AbeDHRti (ORCPT ); Sun, 8 Apr 2018 13:49:38 -0400 Received: by mail-wr0-f194.google.com with SMTP id u46so6323637wrc.11 for ; Sun, 08 Apr 2018 10:49:37 -0700 (PDT) Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: br_port_get_rtnl() can return NULL Signed-off-by: Laszlo Toth --- net/bridge/br_netlink.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 015f465c..cbec11f 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -939,14 +939,17 @@ static int br_port_slave_changelink(struct net_device *brdev, struct nlattr *data[], struct netlink_ext_ack *extack) { + struct net_bridge_port *port = br_port_get_rtnl(dev); struct net_bridge *br = netdev_priv(brdev); int ret; if (!data) return 0; + if (!port) + return -EINVAL; spin_lock_bh(&br->lock); - ret = br_setport(br_port_get_rtnl(dev), data); + ret = br_setport(port, data); spin_unlock_bh(&br->lock); return ret; @@ -956,7 +959,12 @@ static int br_port_fill_slave_info(struct sk_buff *skb, const struct net_device *brdev, const struct net_device *dev) { - return br_port_fill_attrs(skb, br_port_get_rtnl(dev)); + struct net_bridge_port *port = br_port_get_rtnl(dev); + + if (!port) + return -EINVAL; + + return br_port_fill_attrs(skb, port); } static size_t br_port_get_slave_size(const struct net_device *brdev, -- 2.7.4