From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751260AbcFNGHY (ORCPT <rfc822;w@1wt.eu>);
	Tue, 14 Jun 2016 02:07:24 -0400
Received: from narfation.org ([79.140.41.39]:50290 "EHLO v3-1039.vlinux.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751049AbcFNGHW (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 14 Jun 2016 02:07:22 -0400
Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org
From: Sven Eckelmann <sven@narfation.org>
To: Ben Hutchings <ben@decadent.org.uk>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        akpm@linux-foundation.org, Marek Lindner <mareklindner@neomailbox.ch>,
        Linus =?ISO-8859-1?Q?L=FCssing?= <linus.luessing@c0d3.blue>,
        Antonio Quartulli <a@unstable.cc>
Subject: Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface
Date: Tue, 14 Jun 2016 08:07:14 +0200
Message-ID: <2876038.aLAN11RPNH@sven-edge>
User-Agent: KMail/4.14.10 (Linux/4.6.0-1-amd64; KDE/4.14.20; x86_64; ; )
In-Reply-To: <1465858386.3529.225.camel@decadent.org.uk>
References: <lsq.1465842997.536267398@decadent.org.uk> <4657746.cKVj6RgzQ6@sven-edge> <1465858386.3529.225.camel@decadent.org.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart37588535.8KICFedURt"; micalg="pgp-sha512"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--nextPart37588535.8KICFedURt
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="iso-8859-1"

Hi,

On Monday 13 June 2016 23:53:06 Ben Hutchings wrote:
[...]
>=20
> Yes, I recognise this bug.  I've updated this patch to the version be=
low.

looks good to me. Thanks for updating the patch :)

Kind regards,
=09Sven

> ---
> batman-adv: Fix broadcast/ogm queue limit on a removed interface
>=20
> commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream.
>=20
> When removing a single interface while a broadcast or ogm packet is
> still pending then we will free the forward packet without releasing =
the
> queue slots again.
>=20
> This patch is supposed to fix this issue.
>=20
> Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in
> forw_packet_free") Signed-off-by: Linus L=FCssing <linus.luessing@c0d=
3.blue>
> [sven@narfation.org: fix conflicts with current version]
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
>  net/batman-adv/send.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>=20
> --- a/net/batman-adv/send.c
> +++ b/net/batman-adv/send.c
> @@ -611,6 +611,9 @@ batadv_purge_outstanding_packets(struct
>=20
>  =09=09if (pending) {
>  =09=09=09hlist_del(&forw_packet->list);
> +=09=09=09if (!forw_packet->own)
> +=09=09=09=09atomic_inc(&bat_priv->bcast_queue_left);
> +
>  =09=09=09batadv_forw_packet_free(forw_packet);
>  =09=09}
>  =09}
> @@ -638,6 +641,9 @@ batadv_purge_outstanding_packets(struct
>=20
>  =09=09if (pending) {
>  =09=09=09hlist_del(&forw_packet->list);
> +=09=09=09if (!forw_packet->own)
> +=09=09=09=09atomic_inc(&bat_priv->batman_queue_left);
> +
>  =09=09=09batadv_forw_packet_free(forw_packet);
>  =09=09}
>  =09}
>=20
> --=20
> Ben Hutchings
> One of the nice things about standards is that there are so many of
> them.

--nextPart37588535.8KICFedURt
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABCgAGBQJXX58SAAoJEF2HCgfBJntGd6kQAI9l7XYxdHWwpPGLP5/XxWqp
y/c853dmQU6zpWX/1WWJB3SQJfAAfL8EyMoHfGQqFxS3H4xEHOCkYJeSHbKR79Bv
rV8uJYXix+ygZXpUi5ShG7QyNitiioVnDaoTuVNYYBL0ym2JBXpm4Zyb5qoYaUUV
jqeOsNmXlzidXZX9QwkVehAuJWj7TIzMIRsf/uNq+jYAZyEuPsR8kh4j6V50IUJu
R8g4fNZQFwX9IoP+IYOEyxLUBaOGwe9VEWWbhJmWQ12u+S9pa3Lruh7ookgHkiYT
wbGL6LUsZ2TnsJZ/1HaFQH0gILLVfW/Pvr+xj51d4SSvuTEaStQ49DUnncwXhizy
JEaT4Q4bfeBqs8WyNOIPQ0RxbBmrXzkzCMq4dqvVAbyJM6QVN0EeNn4ytMZW0SWB
uKOWuo3VX7pNzharlgrheuSYQIag9NiExBq7b96yHgf7+o4Kd1dZ6lTlQPylQdze
2YFcWEg/I2FURoaLy7KGljDoDqeb4G168SPvD9g+YLcqvDWk44PVQG7ashi1iupF
rGBLjOO39SorrDvyvbzsG5bac5PZHX80kZTCEo/gkxpZZZZSK+ZRxzCuzlwMRBou
5hfyAC0v04ENuG+Zz/7NJo1eCaenDVq2lXOCk+M4vKWh43oyVl8h0vlT2SzL7h19
ciOiNe3MMkMc4zLOL0i2
=yf+M
-----END PGP SIGNATURE-----

--nextPart37588535.8KICFedURt--