[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150414204133.GJ7682@obsidianresearch.com>
Date: Tue, 14 Apr 2015 14:41:33 -0600
From: Jason Gunthorpe <jgunthorpe@...idianresearch.com>
To: Erez Shitrit <erezsh@....mellanox.co.il>
Cc: Honggang Li <honli@...hat.com>, Roland Dreier <roland@...nel.org>,
sean.hefty@...el.com, hal.rosenstock@...il.com, kaber@...sh.net,
davem@...emloft.net, Alex Estrin <alex.estrin@...el.com>,
Doug Ledford <dledford@...hat.com>, edumazet@...gle.com,
Erez Shitrit <erezsh@...lanox.com>, nicolas.dichtel@...nd.com,
maheshb@...gle.com, jbenc@...hat.com, ebiederm@...ssion.com,
elfring@...rs.sourceforge.net, f.fainelli@...il.com,
linux@...ck-us.net, andrew@...n.ch, sfeldma@...il.com,
alexander.h.duyck@...el.com,
"linux-rdma@...r.kernel.org" <linux-rdma@...r.kernel.org>,
linux-kernel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH linux-next 1/4] infiniband/ipoib: fix possible NULL
pointer dereference in ipoib_get_iflink
On Tue, Apr 14, 2015 at 07:30:03PM +0300, Erez Shitrit wrote:
> > diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> > index 657b89b..11ea6e2 100644
> > +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> > @@ -846,7 +846,10 @@ static int ipoib_get_iflink(const struct net_device *dev)
> > {
> > struct ipoib_dev_priv *priv = netdev_priv(dev);
> >
> > - return priv->parent->ifindex;
> > + if (priv && priv->parent)
> > + return priv->parent->ifindex;
> > + else
> > + return 0;
> This will make parent interface to return 0 instead of its own ifindex.
> I would suggest write something like that:
Agree
> + /* parent interface */
> + if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags))
> + return dev->ifindex;
> +
> + /* child/vlan interface */
> + if (!priv->parent)
> + return -1;
Like was said for other drivers, I can't see how parent can be null
while IPOIB_FLAG_SUBINTERFACE is set. Drop the last if.
Erez, you basically rewrote this, please make a proper patch with the
Fixes and Reported-By credit for Honggang. Lets merge this through
Dave M's tree right away.
Thank you all
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists