From f51aab7747b2600497d433e3183d8d85a507d486 Mon Sep 17 00:00:00 2001 From: Ansis Atteka Date: Mon, 9 Apr 2012 12:12:12 -0700 Subject: [PATCH] --- yaml --- r: 315745 b: refs/heads/master c: 03fbf8b38792448370343f240131d9fde19d0387 h: refs/heads/master i: 315743: 250ff613d461bcaec48691d5d17cf420f332af56 v: v3 --- [refs] | 2 +- trunk/net/openvswitch/datapath.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0d9abc1de25d..9f82f19fc335 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c55177e3e1e8a89d9d810d95ac18cb104865322c +refs/heads/master: 03fbf8b38792448370343f240131d9fde19d0387 diff --git a/trunk/net/openvswitch/datapath.c b/trunk/net/openvswitch/datapath.c index e44e631ea952..4813d953d8f2 100644 --- a/trunk/net/openvswitch/datapath.c +++ b/trunk/net/openvswitch/datapath.c @@ -1635,7 +1635,9 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info) if (!err && a[OVS_VPORT_ATTR_OPTIONS]) err = ovs_vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]); - if (!err && a[OVS_VPORT_ATTR_UPCALL_PID]) + if (err) + goto exit_unlock; + if (a[OVS_VPORT_ATTR_UPCALL_PID]) vport->upcall_pid = nla_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]); reply = ovs_vport_cmd_build_info(vport, info->snd_pid, info->snd_seq,