openvswitch: Immediately exit on error in ovs_vport_cmd_set().
It is an error to try to change the type of a vport using the set command. However, while we check that this is an error, we still proceed to allocate memory which then gets freed immediately. This stops processing after noticing the error, which does not actually fix a bug but is more correct. Signed-off-by: Jesse Gross <jesse@nicira.com>
This commit is contained in:
parent
f722406faa
commit
f44f340883
|
@ -1812,10 +1812,11 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
|
||||||
if (IS_ERR(vport))
|
if (IS_ERR(vport))
|
||||||
goto exit_unlock;
|
goto exit_unlock;
|
||||||
|
|
||||||
err = 0;
|
|
||||||
if (a[OVS_VPORT_ATTR_TYPE] &&
|
if (a[OVS_VPORT_ATTR_TYPE] &&
|
||||||
nla_get_u32(a[OVS_VPORT_ATTR_TYPE]) != vport->ops->type)
|
nla_get_u32(a[OVS_VPORT_ATTR_TYPE]) != vport->ops->type) {
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
|
goto exit_unlock;
|
||||||
|
}
|
||||||
|
|
||||||
reply = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
reply = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
||||||
if (!reply) {
|
if (!reply) {
|
||||||
|
@ -1823,10 +1824,11 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
|
||||||
goto exit_unlock;
|
goto exit_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!err && a[OVS_VPORT_ATTR_OPTIONS])
|
if (a[OVS_VPORT_ATTR_OPTIONS]) {
|
||||||
err = ovs_vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]);
|
err = ovs_vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]);
|
||||||
if (err)
|
if (err)
|
||||||
goto exit_free;
|
goto exit_free;
|
||||||
|
}
|
||||||
|
|
||||||
if (a[OVS_VPORT_ATTR_UPCALL_PID])
|
if (a[OVS_VPORT_ATTR_UPCALL_PID])
|
||||||
vport->upcall_portid = nla_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]);
|
vport->upcall_portid = nla_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]);
|
||||||
|
|
Loading…
Reference in a new issue