Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-08-21 17:06:42 -07:00
parent 7d3f0cd43f 6470812e22
commit e2a7c34fb2
199 changed files with 1218 additions and 655 deletions
@@ -258,13 +258,15 @@ static int tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd,
 	arg = nlmsg_new(0, GFP_KERNEL);
 	if (!arg) {
 		kfree_skb(msg->rep);
+		msg->rep = NULL;
 		return -ENOMEM;
 	}

 	err = __tipc_nl_compat_dumpit(cmd, msg, arg);
-	if (err)
+	if (err) {
 		kfree_skb(msg->rep);
-
+		msg->rep = NULL;
+	}
 	kfree_skb(arg);

 	return err;