1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c
index d08491ed5455..baa8b05b9e8d 100644
--- a/drivers/staging/batman-adv/hard-interface.c
+++ b/drivers/staging/batman-adv/hard-interface.c
@@ -129,6 +129,9 @@ static bool hardif_is_iface_up(struct batman_if *batman_if)
 
 static void update_mac_addresses(struct batman_if *batman_if)
 {
+        if (!batman_if || !batman_if->packet_buff)
+                return;
+
         addr_to_string(batman_if->addr_str, batman_if->net_dev->dev_addr);
 
         memcpy(((struct batman_packet *)(batman_if->packet_buff))->orig,
@@ -334,6 +337,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev)
         batman_if->if_num = -1;
         batman_if->net_dev = net_dev;
         batman_if->if_status = IF_NOT_IN_USE;
+        batman_if->packet_buff = NULL;
         INIT_LIST_HEAD(&batman_if->list);
 
         check_known_mac_addr(batman_if->net_dev->dev_addr);