X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fopenvswitch%2Fdatapath.c;h=8601b320b443ba0a0dfdadb54f4fddf78a8308a7;hb=632b06aa2842b12c6d6a510ec080fb6ebdb38ea5;hp=e9a48baf85510f92a5d29aceed7d27acce24035a;hpb=3ebd3da699731929af8ef879001c8c38d1817211;p=~andy%2Flinux

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index e9a48baf855..8601b320b44 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1174,7 +1174,7 @@ static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *in
 	struct datapath *dp;
 
 	dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
-	if (!dp)
+	if (IS_ERR(dp))
 		return;
 
 	WARN(dp->user_features, "Dropping previously announced user features\n");
@@ -1762,11 +1762,12 @@ static int ovs_vport_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
 	int bucket = cb->args[0], skip = cb->args[1];
 	int i, j = 0;
 
+	rcu_read_lock();
 	dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
-	if (!dp)
+	if (!dp) {
+		rcu_read_unlock();
 		return -ENODEV;
-
-	rcu_read_lock();
+	}
 	for (i = bucket; i < DP_VPORT_HASH_BUCKETS; i++) {
 		struct vport *vport;