Skip to contentSkip to conversation

ovs: fix dp check in ovs_dp_reset_user_features

PATCH Applied Jiri Pirko 2 participants 2 messages Feb 14, 2014 – Feb 16, 2014 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

Jiri Pirko

author
#0 lore raw

PATCH 1/1 ovs: 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 44da5ae5fbea4686f667dc854e5ea16814e44c59
"openvswitch: Drop user features if old user space attempted to create datapath"

---
 net/openvswitch/datapath.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/openvswitch/datapath.c +1 -1
index e9a48ba..e42340d 100644
@@ -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");
Signature · 1 line
1.8.5.3

A message that is not in the archive (sent off-list or not yet received): 1392374556-8375-1-git-send-email-jiri-rHqAuBHg3fBzbRFIqnYvSA@public.gmane.org

Applied
#2 lore raw
Quoted 8 lines · 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"

Applied, thanks.