[linux] 01/01: batman-adv: Fix double-put of vlan object

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie
in repository linux.

commit c12d97ecc5069277ce66f6a34b8b2b89c01fa7f1
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jun 26 12:08:04 2016 +0200

    batman-adv: Fix double-put of vlan object
    
    Fixes a bug left in 3.16.36 by the previous ref-counting fix.  Not
    sure if it's actually a regression.
---
 debian/changelog                                   |  1 +
 .../batman-adv-fix-double-put-of-vlan-object.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1102a41..704eabc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -382,6 +382,7 @@ linux (3.16.36-1) UNRELEASED; urgency=medium
   * libceph: Ignore ABI changes; these functions are only used by the
     ceph filesystem
   * migrate, sched: Fix ABI changes
+  * batman-adv: Fix double-put of vlan object
 
   [ Aurelien Jarno ]
   * [mips*] Emulate unaligned LDXC1 and SDXC1 instructions.
diff --git a/debian/patches/bugfix/all/batman-adv-fix-double-put-of-vlan-object.patch b/debian/patches/bugfix/all/batman-adv-fix-double-put-of-vlan-object.patch
new file mode 100644
index 0000000..0bf41c1
--- /dev/null
+++ b/debian/patches/bugfix/all/batman-adv-fix-double-put-of-vlan-object.patch
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 26 Jun 2016 11:16:11 +0200
+Subject: batman-adv: Fix double-put of vlan object
+Origin: http://mid.gmane.org/1466932573-23105-3-git-send-email-sven@narfation.org
+
+Each batadv_tt_local_entry hold a single reference to a
+batadv_softif_vlan.  In case a new entry cannot be added to the hash
+table, the error path puts the reference, but the reference will also
+now be dropped by batadv_tt_local_entry_release().
+
+Fixes: a33d970d0b54 ("batman-adv: Fix reference counting of vlan object for tt_local_entry")
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
+Signed-off-by: Sven Eckelmann <sven at narfation.org>
+[bwh: For 3.16: s/_put/_free_ref/ in function names]
+---
+ net/batman-adv/translation-table.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/net/batman-adv/translation-table.c
++++ b/net/batman-adv/translation-table.c
+@@ -613,7 +613,6 @@ bool batadv_tt_local_add(struct net_devi
+ 	if (unlikely(hash_added != 0)) {
+ 		/* remove the reference for the hash */
+ 		batadv_tt_local_entry_free_ref(tt_local);
+-		batadv_softif_vlan_free_ref(vlan);
+ 		goto out;
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e0557b9..3be0f1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -665,6 +665,7 @@ bugfix/all/netfilter-x_tables-introduce-and-use-xt_copy_counter.patch
 bugfix/all/posix_acl-Add-set_posix_acl.patch
 bugfix/all/nfsd-check-permissions-when-setting-ACLs.patch
 bugfix/all/netfilter-ensure-number-of-counters-is-0-in-do_repla.patch
+bugfix/all/batman-adv-fix-double-put-of-vlan-object.patch
 
 # Fix ABI changes
 debian/of-fix-abi-changes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git