X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport.c;h=852a3c69f5f00dbb15cfcdfecdec3e81333503f9;hb=47e0120572fdca82f2e97b82bee5ff2e36b6c93e;hp=517e871ee3d25af55092087124fdceca10860e4e;hpb=ed099e921e30d3720c5ad7d1b4f911bb23911bf3;p=openvswitch

diff --git a/datapath/vport.c b/datapath/vport.c
index 517e871e..852a3c69 100644
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -625,7 +625,8 @@ int vport_get_mtu(const struct vport *vport)
  * vport-specific attributes to @skb.
  *
  * Returns 0 if successful, -EMSGSIZE if @skb has insufficient room, or another
- * negative error code if a real error occurred.
+ * negative error code if a real error occurred.  If an error occurs, @skb is
+ * left unmodified.
  *
  * Must be called with RTNL lock or rcu_read_lock.
  */
@@ -639,8 +640,10 @@ int vport_get_options(const struct vport *vport, struct sk_buff *skb)
 
 	if (vport->ops->get_options) {
 		int err = vport->ops->get_options(vport, skb);
-		if (err)
+		if (err) {
+			nla_nest_cancel(skb, nla);
 			return err;
+		}
 	}
 
 	nla_nest_end(skb, nla);