mbox

pull request: batman-adv 20160518

Message ID 1463547892-11290-1-git-send-email-a@unstable.cc
State Not Applicable, archived
Headers show

Pull-request

git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem

Message

Antonio Quartulli May 18, 2016, 5:04 a.m. UTC
Hi David,

these are the fixes that couldn't make it for linux-4.6 rebased on top
of net-next.

They were all supposed to be applied on 4.6, therefore it would be nice
if you could queue them for inclusion in the 4.6.1 stable release.

Please pull or let me know of any problem!


I also have a question: I have another bugfix that should only be
applied to 4.6 and not to 4.7/net-next - should I directly send it
to stable@vger.kernel.org ?


Thanks a lot,
	Antonio

The following changes since commit 917fa5353da05e8a0045b8acacba8d50400d5b12:

  Revert "phy dp83867: Fix compilation with CONFIG_OF_MDIO=m" (2016-05-17 14:49:55 -0400)

are available in the git repository at:

  git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem

for you to fetch changes up to ebe24cea95ab969f76f2922032f6c390fdc816f2:

  batman-adv: initialize ELP orig address on secondary interfaces (2016-05-18 11:49:44 +0800)

----------------------------------------------------------------
During the Wireless Battle Mesh v9 in Porto (PT) at the beginning of
May, we managed to uncover and fix some important bugs in our
new B.A.T.M.A.N. V algorithm. These are the fixes we came up with
together with others that I collected in the past weeks:
- avoid potential crash due to NULL pointer dereference in
  B.A.T.M.A.N. V routine when a neigh_ifinfo object is not found, by
  Sven Eckelmann
- avoid use-after-free of skb when counting outgoing bytes, by Florian
  Westphal
- fix neigh_ifinfo object reference counting imbalance when using
  B.A.T.M.A.N. V, by Sven Eckelmann. Such imbalance may lead to the
  impossibility of releasing the related netdev object on shutdown
- avoid invalid memory access in case of error while allocating
  bcast_own_sum when a new hard-interface is added, by Sven Eckelmann
- ensure originator address is updated in OMG/ELP packet content upon
  primary interface address change, by Antonio Quartulli
- fix integer overflow when computing TQ metric (B.A.T.M.A.N. IV), by
  Sven Eckelmann
- avoid race condition while adding new neigh_node which would result
  in having two objects mapping to the same physical neighbour, by
  Linus Lüssing
- ensure originator address is initialized in ELP packet content on
  secondary interfaces, by Marek Lindner

----------------------------------------------------------------
Antonio Quartulli (1):
      batman-adv: make sure ELP/OGM orig MAC is updated on address change

Florian Westphal (1):
      batman-adv: fix skb deref after free

Linus Lüssing (1):
      batman-adv: Avoid duplicate neigh_node additions

Marek Lindner (1):
      batman-adv: initialize ELP orig address on secondary interfaces

Sven Eckelmann (4):
      batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob
      batman-adv: Fix refcnt leak in batadv_v_neigh_*
      batman-adv: Fix unexpected free of bcast_own on add_if error
      batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tq

 net/batman-adv/bat_iv_ogm.c |  9 +++----
 net/batman-adv/bat_v.c      | 66 +++++++++++++++++++++++++++++++++++++++------
 net/batman-adv/bat_v_elp.c  | 31 ++++++++++++++-------
 net/batman-adv/bat_v_elp.h  |  2 ++
 net/batman-adv/originator.c |  6 +++--
 net/batman-adv/routing.c    |  4 ++-
 6 files changed, 93 insertions(+), 25 deletions(-)

Comments

Sven Eckelmann May 18, 2016, 8 a.m. UTC | #1
On Wednesday 18 May 2016 13:04:44 Antonio Quartulli wrote:
> I also have a question: I have another bugfix that should only be
> applied to 4.6 and not to 4.7/net-next - should I directly send it
> to stable@vger.kernel.org ?

Allow me to give some background info:

The bug was (accidentally) fixed by a refactoring patch [1] in net-next. But
the problem was then discovered by people which used net and not net-next.

I have created a bugfix [2] which would solve the problem in net but wouldn't
apply in net-next. This is why Antonio asked if he should send it to stable@
or if there is a better way to get it integrated.

Kind regards,
	Sven


[1] https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/net/batman-adv?id=efcc9d3069c982786f380bca8480a1aa2fd2721d
[2] https://git.open-mesh.org/linux-merge.git/commit/af06cf325cfb5a2685a6f8997585b83a91f36c4c
David Miller May 19, 2016, 6:51 p.m. UTC | #2
From: Antonio Quartulli <a@unstable.cc>
Date: Wed, 18 May 2016 13:04:44 +0800

> these are the fixes that couldn't make it for linux-4.6 rebased on top
> of net-next.
> 
> They were all supposed to be applied on 4.6, therefore it would be nice
> if you could queue them for inclusion in the 4.6.1 stable release.
> 
> Please pull or let me know of any problem!

Pulled, thanks.

> I also have a question: I have another bugfix that should only be
> applied to 4.6 and not to 4.7/net-next - should I directly send it
> to stable@vger.kernel.org ?

Yeah, why don't you send it directly to the stable list.

Thanks.