On Wed, 2017-09-20 at 16:05 -0700, David Miller wrote:
> From: Samuel Mendoza-Jonas <s...@mendozajonas.com>
> Date: Wed, 20 Sep 2017 14:12:51 +1000
> > When handling new VLAN tags in NCSI we check the maximum allowed number
> > of filters on the last active ("hot") channel. However if the 'add'
> > callback is called before NCSI has configured a channel, this causes a
> > NULL dereference.
> > Check that we actually have a hot channel, and warn if it is missing.
> > Signed-off-by: Samuel Mendoza-Jonas <s...@mendozajonas.com>
> Well, a few things.
> We should not allow this driver method to be invoked in the first
> place if the device is not in a state where the operation is legal
> Second of all, if !ndp is true, you should not return 0 to indicate
> But more fundamentally, we should block this method from being
> callable unless the device is in the proper state and can complete the
> Seriously, these checks should be completely unnecessary if those
> issues are handled properly.
Good point, this made me step back and reconsider the problem here.
The ncsi_vlan_rx_add_vid() callback exists because the NCSI driver needs
to know which VLAN IDs are set, but we don't have a straightforward way
of accessing that information later in ncsi_configure_channel() - as
opposed to the MAC address for example which is just accessed via
dev->dev_addr. Instead they're kept track of in the ndp->vlan_vids list
and the NCSI driver reconfigures any channels it knows about.
So in that sense the NCSI device *is* ready to handle the operation. The
hot_channel fix here was to check if we were exceeding the maximum number
of VLAN filters supported by the remote channel. That itself is bit
debatable since different channels could support different numbers of
filters but right now the NCSI driver only supports one active channel at
If we haven't configured a channel yet (or are in the process of doing
so) we won't have a hot_channel - does it make more sense to
- check against the hot_channel as currently done,
- only check the filter size at configure time for /each/ channel,
- only conditionally enable the .ndo_vlan_rx_add_vid net_device callback
once we've configured a channel (eg. for ftgmac100 in the