[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvswitch-dev
Subject:    [ovs-dev] [PATCH branch-1.5] ofproto-dpif: Fix merge error that caused memory leak.
From:       blp () nicira ! com (Ben Pfaff)
Date:       2012-01-31 21:01:01
Message-ID: 20120131210101.GI4179 () nicira ! com
[Download RAW message or body]

I didn't ask for a separate review for the crossport to branch-1.5, so
the error is mine.

Thanks,

Ben.

On Tue, Jan 31, 2012 at 12:56:36PM -0800, Ethan Jackson wrote:
> I should have caught that in review.  Looks good, thanks.
> 
> Ethan
> 
> On Tue, Jan 31, 2012 at 12:55, Ben Pfaff <blp at nicira.com> wrote:
> > Commit 5aa0fe5be (ofproto-dpif: Fix use-after-free error in
> > handle_miss_upcalls().), a crossport from master of commit 33bb0caa6,
> > did not include this necessary change, causing a memory leak.
> >
> > Bug #9493.
> > Reported-by: Michael Hu <mhu at nicira.com>
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> > ?ofproto/ofproto-dpif.c | ? ?1 -
> > ?1 files changed, 0 insertions(+), 1 deletions(-)
> >
> > diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
> > index 9fb8fcc..b6e42f8 100644
> > --- a/ofproto/ofproto-dpif.c
> > +++ b/ofproto/ofproto-dpif.c
> > @@ -2537,7 +2537,6 @@ handle_flow_miss(struct ofproto_dpif *ofproto, struct flow_miss *miss,
> > ? ? ? ? struct flow_miss_op *op;
> > ? ? ? ? struct dpif_execute *execute;
> >
> > - ? ? ? ?list_remove(&packet->list_node);
> > ? ? ? ? ofproto->n_matches++;
> >
> > ? ? ? ? if (facet->rule->up.cr.priority == FAIL_OPEN_PRIORITY) {
> > --
> > 1.7.2.5
> >
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev


[prev in list] [next in list] [prev in thread] [next in thread]