Thank you, pushed to master, branch-1.4.

On Tue, Dec 13, 2011 at 02:52:49PM -0800, Justin Pettit wrote:
> Looks good.  Thanks.
> 
> --Justin
> 
> 
> On Dec 13, 2011, at 2:42 PM, Ben Pfaff wrote:
> 
> > Not every port has an associated bundle, so we must not unconditionally
> > dereference ofport->bundle without first checking that it is nonnull.
> > 
> > (One example of a port without a bundle is a VLAN splinter port.)
> > 
> > Bug #8671.
> > Reported-by: Michael Mao <m...@nicira.com>
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > ofproto/ofproto-dpif.c |    4 +++-
> > 1 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
> > index 1b654fd..e68bec3 100644
> > --- a/ofproto/ofproto-dpif.c
> > +++ b/ofproto/ofproto-dpif.c
> > @@ -4993,7 +4993,9 @@ add_mirror_actions(struct action_xlate_ctx *ctx, 
> > const struct flow *orig_flow)
> >         }
> > 
> >         ofport = get_odp_port(ofproto, nl_attr_get_u32(a));
> > -        mirrors |= ofport ? ofport->bundle->dst_mirrors : 0;
> > +        if (ofport && ofport->bundle) {
> > +            mirrors |= ofport->bundle->dst_mirrors;
> > +        }
> >     }
> > 
> >     if (!mirrors) {
> > -- 
> > 1.7.4.4
> > 
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
> 
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to