datapath: fix dp check in ovs_dp_reset_user_features
authorJiri Pirko <jiri@resnulli.us>
Sun, 16 Feb 2014 01:30:23 +0000 (17:30 -0800)
committerJesse Gross <jesse@nicira.com>
Sun, 16 Feb 2014 07:58:30 +0000 (23:58 -0800)
This fixes crash when userspace does "ovs-dpctl add-dp dev" where dev is
existing non-dp netdevice.

Introduced by:
commit 94358dcffbec33cbcfd425e925139fd7e9d6153f
"openvswitch: Drop user features if old user space attempted to create datapath"

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Jesse Gross <jesse@nicira.com>
datapath/datapath.c

index f496509..bacc634 100644 (file)
@@ -1176,7 +1176,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");