[patch net] ovs: fix dp check in ovs_dp_reset_user_features

[patch net] ovs: fix dp check in ovs_dp_reset_user_features

[Jiri Pirko]

This fixes crash when userspace does "ovs-dpctl add-dp dev" where dev is
existing non-dp netdevice.

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

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
---
 net/openvswitch/datapath.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index e9a48ba..e42340d 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");
-- 
1.8.5.3

Re: [patch net] ovs: fix dp check in ovs_dp_reset_user_features

[Jesse Gross]

On Fri, Feb 14, 2014 at 2:42 AM, Jiri Pirko <jiri-rHqAuBHg3fBzbRFIqnYvSA@public.gmane.org> wrote:
> This fixes crash when userspace does "ovs-dpctl add-dp dev" where dev is
> existing non-dp netdevice.
>
> Introduced by:
> commit 44da5ae5fbea4686f667dc854e5ea16814e44c59
> "openvswitch: Drop user features if old user space attempted to create datapath"
>
> Signed-off-by: Jiri Pirko <jiri-rHqAuBHg3fBzbRFIqnYvSA@public.gmane.org>

Applied, thanks.