diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-16 16:28:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-16 16:28:53 -0400 |
| commit | 2f67cc87d662e935d2cfaea5a3fb7138ac35c5de (patch) | |
| tree | 9566da4e23526af552b065c2f12c058e52969e79 /net/batman-adv/originator.c | |
| parent | 0d08fceb2e21c30ca3e1e462e678723f806acf18 (diff) | |
| parent | cc2f33860cea0e48ebec096130bd0f7c4bf6e0bc (diff) | |
| download | op-kernel-dev-2f67cc87d662e935d2cfaea5a3fb7138ac35c5de.zip op-kernel-dev-2f67cc87d662e935d2cfaea5a3fb7138ac35c5de.tar.gz | |
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
Include changes:
- fix NULL dereference in batadv_orig_hardif_seq_print_text()
- fix reference counting imbalance when using fragmentation
- avoid access to orig_node objects after they have been free'd
- fix local TT check for outgoing arp requests in DAT
Diffstat (limited to 'net/batman-adv/originator.c')
| -rw-r--r-- | net/batman-adv/originator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 1785da3..6a48451 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1079,7 +1079,8 @@ int batadv_orig_hardif_seq_print_text(struct seq_file *seq, void *offset) bat_priv->bat_algo_ops->bat_orig_print(bat_priv, seq, hard_iface); out: - batadv_hardif_free_ref(hard_iface); + if (hard_iface) + batadv_hardif_free_ref(hard_iface); return 0; } |
