From: Jesse Gross <jesse@nicira.com>
Date: Fri, 24 Dec 2010 00:28:23 +0000 (-0800)
Subject: datapath: Add missing rtnl_dereference() calls.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f827d749920e1bcc275660695144d25c7adbbd4b;p=openvswitch

datapath: Add missing rtnl_dereference() calls.

There are a few additional places where RCU protected pointers
are directly dereferenced because they assume RTNL lock.  These
were previously not reported due to some other sparse errors in
the Linux headers files.  This adds the necessary rtnl_dereference()
calls to make sparse happy and allow lockdep to validate.

Found with sparse.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index 548b99dc..ce1d8eb5 100644
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -1429,7 +1429,8 @@ int tnl_modify(struct vport *vport, struct odp_port *port)
 	struct tnl_mutable_config *mutable;
 	int err;
 
-	mutable = kmemdup(tnl_vport->mutable, sizeof(struct tnl_mutable_config), GFP_KERNEL);
+	mutable = kmemdup(rtnl_dereference(tnl_vport->mutable),
+			  sizeof(struct tnl_mutable_config), GFP_KERNEL);
 	if (!mutable) {
 		err = -ENOMEM;
 		goto error;
@@ -1468,13 +1469,13 @@ static void free_port_rcu(struct rcu_head *rcu)
 int tnl_destroy(struct vport *vport)
 {
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-	const struct tnl_mutable_config *old_mutable;
+	const struct tnl_mutable_config *mutable, *old_mutable;
+
+	mutable = rtnl_dereference(tnl_vport->mutable);
 
-	if (vport == tnl_find_port(tnl_vport->mutable->port_config.saddr,
-	    tnl_vport->mutable->port_config.daddr,
-	    tnl_vport->mutable->port_config.in_key,
-	    tnl_vport->mutable->tunnel_type,
-	    &old_mutable))
+	if (vport == tnl_find_port(mutable->port_config.saddr,
+	    mutable->port_config.daddr, mutable->port_config.in_key,
+	    mutable->tunnel_type, &old_mutable))
 		del_port(vport);
 
 	call_rcu(&tnl_vport->rcu, free_port_rcu);
@@ -1487,7 +1488,8 @@ int tnl_set_mtu(struct vport *vport, int mtu)
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
 	struct tnl_mutable_config *mutable;
 
-	mutable = kmemdup(tnl_vport->mutable, sizeof(struct tnl_mutable_config), GFP_KERNEL);
+	mutable = kmemdup(rtnl_dereference(tnl_vport->mutable),
+			  sizeof(struct tnl_mutable_config), GFP_KERNEL);
 	if (!mutable)
 		return -ENOMEM;
 
@@ -1502,7 +1504,8 @@ int tnl_set_addr(struct vport *vport, const unsigned char *addr)
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
 	struct tnl_mutable_config *mutable;
 
-	mutable = kmemdup(tnl_vport->mutable, sizeof(struct tnl_mutable_config), GFP_KERNEL);
+	mutable = kmemdup(rtnl_dereference(tnl_vport->mutable),
+			  sizeof(struct tnl_mutable_config), GFP_KERNEL);
 	if (!mutable)
 		return -ENOMEM;
 
diff --git a/datapath/vport-patch.c b/datapath/vport-patch.c
index b03c3aa1..ef9778f3 100644
--- a/datapath/vport-patch.c
+++ b/datapath/vport-patch.c
@@ -156,7 +156,8 @@ static int patch_modify(struct vport *vport, struct odp_port *port)
 	struct device_config *devconf;
 	int err;
 
-	devconf = kmemdup(patch_vport->devconf, sizeof(struct device_config), GFP_KERNEL);
+	devconf = kmemdup(rtnl_dereference(patch_vport->devconf),
+			  sizeof(struct device_config), GFP_KERNEL);
 	if (!devconf) {
 		err = -ENOMEM;
 		goto error;
@@ -221,7 +222,8 @@ static int patch_set_mtu(struct vport *vport, int mtu)
 	struct patch_vport *patch_vport = patch_vport_priv(vport);
 	struct device_config *devconf;
 
-	devconf = kmemdup(patch_vport->devconf, sizeof(struct device_config), GFP_KERNEL);
+	devconf = kmemdup(rtnl_dereference(patch_vport->devconf),
+			  sizeof(struct device_config), GFP_KERNEL);
 	if (!devconf)
 		return -ENOMEM;
 
@@ -236,7 +238,8 @@ static int patch_set_addr(struct vport *vport, const unsigned char *addr)
 	struct patch_vport *patch_vport = patch_vport_priv(vport);
 	struct device_config *devconf;
 
-	devconf = kmemdup(patch_vport->devconf, sizeof(struct device_config), GFP_KERNEL);
+	devconf = kmemdup(rtnl_dereference(patch_vport->devconf),
+			  sizeof(struct device_config), GFP_KERNEL);
 	if (!devconf)
 		return -ENOMEM;