X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=net%2Fbatman-adv%2Fbat_v.c;h=50bfcf87f5691d4f63b4f2a44b0492a12663dee1;hb=a45e932a3c58eac11a7458c6888910e23f615077;hp=3ff8bd1b7bdcf6fa9704a5d73461354b7b22a883;hpb=63d443efe8be2c1d02b30d7e4edeb9aa085352b3;p=deliverable%2Flinux.git

diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 3ff8bd1b7bdc..50bfcf87f569 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -27,6 +27,7 @@
 #include <linux/rculist.h>
 #include <linux/rcupdate.h>
 #include <linux/seq_file.h>
+#include <linux/stddef.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
 
@@ -276,6 +277,9 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1,
 	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);
 	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);
 
+	if (WARN_ON(!ifinfo1 || !ifinfo2))
+		return false;
+
 	threshold = ifinfo1->bat_v.throughput / 4;
 	threshold = ifinfo1->bat_v.throughput - threshold;