1 files changed, 2 insertions, 2 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index ee605d9d8bd4..41954e42a2de 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2364,7 +2364,7 @@ static bool neigh_master_filtered(struct net_device *dev, int master_idx)
         if (!master_idx)
                 return false;
 
-        master = netdev_master_upper_dev_get(dev);
+        master = dev ? netdev_master_upper_dev_get(dev) : NULL;
         if (!master || master->ifindex != master_idx)
                 return true;
 
@@ -2373,7 +2373,7 @@ static bool neigh_master_filtered(struct net_device *dev, int master_idx)
 
 static bool neigh_ifindex_filtered(struct net_device *dev, int filter_idx)
 {
-        if (filter_idx && dev->ifindex != filter_idx)
+        if (filter_idx && (!dev || dev->ifindex != filter_idx))
                 return true;
 
         return false;