From f090a19fffacb067fd296c89462a417f59cd9135 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Sat, 15 Feb 2014 17:30:23 -0800 Subject: [PATCH] datapath: fix dp check in ovs_dp_reset_user_features 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 Signed-off-by: Jesse Gross --- datapath/datapath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index f496509ec..bacc634ce 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -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"); -- 2.20.1