X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.c;fp=datapath%2Fdatapath.c;h=492799ddb275974fa3a1808a96a96023afd357a0;hb=40a8ca3292a78639919e32ddd1558ce02ad938eb;hp=ea73f9829cc13491d03a9b0ba84f7ba23a11116d;hpb=197ef7af3c68bceed2d0680ad6f0c01d33d1954b;p=sliver-openvswitch.git

diff --git a/datapath/datapath.c b/datapath/datapath.c
index ea73f9829..492799ddb 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, 2009 Nicira Networks.
+ * Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -859,6 +859,7 @@ static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp)
 	error = -EFAULT;
 	if (copy_from_user(&uf, ufp, sizeof(struct odp_flow_put)))
 		goto error;
+	memset(uf.flow.key.reserved, 0, sizeof uf.flow.key.reserved);
 
 	table = rcu_dereference(dp->table);
 	flow = dp_table_lookup(table, &uf.flow.key);
@@ -1003,6 +1004,7 @@ static int del_flow(struct datapath *dp, struct odp_flow __user *ufp)
 	error = -EFAULT;
 	if (copy_from_user(&uf, ufp, sizeof uf))
 		goto error;
+	memset(uf.key.reserved, 0, sizeof uf.key.reserved);
 
 	flow = dp_table_lookup(table, &uf.key);
 	error = -ENOENT;
@@ -1038,6 +1040,7 @@ static int query_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
 
 		if (__copy_from_user(&uf, ufp, sizeof uf))
 			return -EFAULT;
+		memset(uf.key.reserved, 0, sizeof uf.key.reserved);
 
 		flow = dp_table_lookup(table, &uf.key);
 		if (!flow)