[ovs-dev] [PATCH] ofproto: Fix uninitialized field in ofputil_flow_update.

Mehak Mahajan mmahajan at nicira.com
Thu Sep 20 21:02:26 UTC 2012


Looks good.

thanx!
mehak

On Thu, Sep 20, 2012 at 11:13 AM, Ben Pfaff <blp at nicira.com> wrote:

> From: Anupam Chanda <achanda at nicira.com>
>
> Two instances of ofputil_flow_update had the priority field uninitialized.
> This would cause flow updates to contain undefined priority values.
>
> This bug was introduced by commit 81a76618 (classifier: Break cls_rule
> 'flow' and 'wc' members into new "struct match".)
>
> Signed-off-by: Anupam Chanda <achanda at nicira.com>
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
> This patch came in out-of-band through private email.  Normally I'd
> ask for it to be re-sent to dev at openvswitch.org, but it was such an
> obviously correct bug fix that I just applied it directly.  Thus,
> this is already on master.
>
>  AUTHORS           |    1 +
>  ofproto/connmgr.c |    1 +
>  ofproto/ofproto.c |    1 +
>  3 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/AUTHORS b/AUTHORS
> index 70257e5..1ed8676 100644
> --- a/AUTHORS
> +++ b/AUTHORS
> @@ -6,6 +6,7 @@ Alexey I. Froloff       raorn at altlinux.org
>  Andrew Evans            aevans at nicira.com
>  Andrew Lambeth          wal at nicira.com
>  Andy Southgate          andy.southgate at citrix.com
> +Anupam Chanda           achanda at nicira.com
>  Arun Sharma             arun.sharma at calsoftinc.com
>  Ben Pfaff               blp at nicira.com
>  Brian Kruger            bkruger+ovsdev at gmail.com
> diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
> index 391995e..05e69c7 100644
> --- a/ofproto/connmgr.c
> +++ b/ofproto/connmgr.c
> @@ -1815,6 +1815,7 @@ ofmonitor_report(struct connmgr *mgr, struct rule
> *rule,
>                  fu.cookie = rule->flow_cookie;
>                  minimatch_expand(&rule->cr.match, &match);
>                  fu.match = &match;
> +                fu.priority = rule->cr.priority;
>                  if (flags & NXFMF_ACTIONS) {
>                      fu.ofpacts = rule->ofpacts;
>                      fu.ofpacts_len = rule->ofpacts_len;
> diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
> index 47cf22b..e3b24c1 100644
> --- a/ofproto/ofproto.c
> +++ b/ofproto/ofproto.c
> @@ -3550,6 +3550,7 @@ ofproto_compose_flow_refresh_update(const struct
> rule *rule,
>      fu.cookie = rule->flow_cookie;
>      minimatch_expand(&rule->cr.match, &match);
>      fu.match = &match;
> +    fu.priority = rule->cr.priority;
>      if (!(flags & NXFMF_ACTIONS)) {
>          fu.ofpacts = NULL;
>          fu.ofpacts_len = 0;
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openvswitch.org/pipermail/ovs-dev/attachments/20120920/2292557c/attachment-0003.html>


More information about the dev mailing list