From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:34944 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750942AbcEGTyJ (ORCPT ); Sat, 7 May 2016 15:54:09 -0400 Date: Sat, 7 May 2016 21:54:05 +0200 From: Greg KH To: Sven Eckelmann Cc: linus.luessing@c0d3.blue, a@unstable.cc, mareklindner@neomailbox.ch, stable@vger.kernel.org, stable-commits@vger.kernel.org Subject: Re: Patch "batman-adv: Fix broadcast/ogm queue limit on a removed interface" has been added to the 3.14-stable tree Message-ID: <20160507195405.GA4376@kroah.com> References: <1462559816207195@kroah.com> <1498923.rWPraOBnBH@sven-edge> <20160507044012.GC28252@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160507044012.GC28252@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: On Sat, May 07, 2016 at 12:40:12AM -0400, Greg KH wrote: > On Fri, May 06, 2016 at 10:03:50PM +0200, Sven Eckelmann wrote: > > On Friday 06 May 2016 14:36:56 gregkh@linuxfoundation.org wrote: > > [...] > > > The filename of the patch is: > > > batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch > > > and it can be found in the queue-3.14 subdirectory. > > [...] > > > --- a/net/batman-adv/send.c > > > +++ b/net/batman-adv/send.c > > > @@ -637,6 +637,12 @@ batadv_purge_outstanding_packets(struct > > > > > > if (pending) { > > > hlist_del(&forw_packet->list); > > > + if (!forw_packet->own) > > > + atomic_inc(&bat_priv->bcast_queue_left); > > > + > > > + if (!forw_packet->own) > > > + atomic_inc(&bat_priv->batman_queue_left); > > > + > > > batadv_forw_packet_free(forw_packet); > > > } > > > } > > > > > > > This looks odd. Why is this commit doing the inc twice in the same place? > > Looks different than the origin patch (which does it for two different > > places): > > > > https://patchwork.open-mesh.org/patch/15974/ > > > > Same for the 4.4 and 4.5 stable changes. I've cherry-picked the commit for > > 3.14 and my results look like this (not even compile tested): > > > > --- a/net/batman-adv/send.c > > +++ b/net/batman-adv/send.c > > @@ -610,6 +610,9 @@ batadv_purge_outstanding_packets(struct batadv_priv > > *bat_priv, > > > > if (pending) { > > hlist_del(&forw_packet->list); > > + if (!forw_packet->own) > > + atomic_inc(&bat_priv->bcast_queue_left); > > + > > batadv_forw_packet_free(forw_packet); > > } > > } > > @@ -637,6 +640,9 @@ batadv_purge_outstanding_packets(struct batadv_priv > > *bat_priv, > > > > if (pending) { > > hlist_del(&forw_packet->list); > > + if (!forw_packet->own) > > + atomic_inc(&bat_priv->batman_queue_left); > > + > > batadv_forw_packet_free(forw_packet); > > } > > } > > > > Oh that's really odd, thanks for letting me know. Let me try to figure > out what went wrong... This looks like a bug in patch. Git creates the correct patch, but when patch imports it, it messes it up and creates the version you saw. I hand edited the file after it was patched to fix this up. If I get a chance I'll go file a bug with the patch developers. thanks, greg k-h