From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53892 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985AbbFXOzE (ORCPT ); Wed, 24 Jun 2015 10:55:04 -0400 Date: Wed, 24 Jun 2015 07:55:02 -0700 From: Greg KH To: Steven Rostedt Cc: Jiri Slaby , stable@vger.kernel.org, stable-commits@vger.kernel.org, Luis Henriques Subject: Re: Patch "tracing: Have filter check for balanced ops" has been added to the 3.14-stable tree Message-ID: <20150624145502.GD17352@kroah.com> References: <1435029721180139@kroah.com> <55895DAA.4030404@suse.cz> <20150623094059.269e8e6c@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150623094059.269e8e6c@gandalf.local.home> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Jun 23, 2015 at 09:40:59AM -0400, Steven Rostedt wrote: > On Tue, 23 Jun 2015 15:22:50 +0200 > Jiri Slaby wrote: > > > > > --- a/kernel/trace/trace_events_filter.c > > > +++ b/kernel/trace/trace_events_filter.c > > > @@ -1399,19 +1399,26 @@ static int check_preds(struct filter_par > > > { > > > int n_normal_preds = 0, n_logical_preds = 0; > > > struct postfix_elt *elt; > > > + int cnt = 0; > > > > > > list_for_each_entry(elt, &ps->postfix, list) { > > > - if (elt->op == OP_NONE) > > > + if (elt->op == OP_NONE) { > > > + cnt++; > > > continue; > > > + } > > > > > > if (elt->op == OP_AND || elt->op == OP_OR) { > > > n_logical_preds++; > > > + cnt--; > > > continue; > > > } > > > + if (elt->op != OP_NOT) > > > > This breaks build, OP_NOT is not in 3.14 (or 3.10) yet. I dropped this > > line for 3.12. > > Luis has a version he used for his stable tree, which should also work > for yours. > > See this: > > http://lkml.kernel.org/r/20150622144940.GD2036@ares Yes, now used, thanks. greg k-h