Patch "batman-adv: fix kernel crash due to missing NULL checks" has been added to the 4.1-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
batman-adv: fix kernel crash due to missing NULL checks
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
batman-adv-fix-kernel-crash-due-to-missing-null-checks.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
354136bcc3c4f40a2813bba8f57ca5267d812d15Mon Sep 17 00:00:00 2001
From: Marek Lindner <[email protected]>
Date: Tue, 9 Jun 2015 21:24:36 +0800
Subject: batman-adv: fix kernel crash due to missing NULL checks
From: Marek Lindner <[email protected]>
commit 354136bcc3c4f40a2813bba8f57ca5267d812d15 upstream.
batadv_softif_vlan_get() may return NULL which has to be verified by the caller.
--- net/batman-adv/soft-interface.c | 3 +++ net/batman-adv/translation-table.c | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
net/batman-adv/soft-interface.c +3 -0
@@ -449,6 +449,9 @@ out:*/ void batadv_softif_vlan_free_ref (struct batadv_softif_vlan *vlan) { +if (!vlan) +return ; +if (atomic_dec_and_test (&vlan->refcount)) {spin_lock_bh (&vlan->bat_priv->softif_vlan_list_lock);hlist_del_rcu (&vlan->list);
net/batman-adv/translation-table.c +14 -4
@@ -575,6 +575,9 @@ bool batadv_tt_local_add(struct net_devi/* increase the refcounter of the related vlan */ vlan =batadv_softif_vlan_get (bat_priv, vid); +if (WARN (!vlan,"adding TT local entry %pM to non-existent VLAN %d" , + addr,BATADV_PRINT_VID (vid))) + goto out; batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n",
@@ -1047,6 +1050,9 @@ uint16_t batadv_tt_local_remove(struct b/* decrease the reference held for this vlan */ vlan =batadv_softif_vlan_get (bat_priv, vid); +if (!vlan) + goto out; +batadv_softif_vlan_free_ref (vlan);batadv_softif_vlan_free_ref (vlan);
@@ -1147,8 +1153,10 @@ static void batadv_tt_local_table_free(s/* decrease the reference held for this vlan */ vlan =batadv_softif_vlan_get (bat_priv, tt_common_entry->vid); -batadv_softif_vlan_free_ref (vlan); -batadv_softif_vlan_free_ref (vlan); +if (vlan) { +batadv_softif_vlan_free_ref (vlan); +batadv_softif_vlan_free_ref (vlan); + }batadv_tt_local_entry_free_ref (tt_local); }
@@ -3188,8 +3196,10 @@ static void batadv_tt_local_purge_pendin/* decrease the reference held for this vlan */ vlan =batadv_softif_vlan_get (bat_priv, tt_common->vid); -batadv_softif_vlan_free_ref (vlan); -batadv_softif_vlan_free_ref (vlan); +if (vlan) { +batadv_softif_vlan_free_ref (vlan); +batadv_softif_vlan_free_ref (vlan); + }batadv_tt_local_entry_free_ref (tt_local); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/batman-adv-fix-kernel-crash-due-to-missing-null-checks.patch queue-4.1/batman-adv-make-dat-capability-changes-atomic.patch queue-4.1/batman-adv-protect-tt_local_entry-from-concurrent-delete-events.patch