From ce3d5f719c8cd36ab2ec636de9277b710902a623 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Fri, 26 Apr 2013 15:34:16 +0000
Subject: [PATCH] --- yaml --- r: 369765 b: refs/heads/master c:
 50754d2188b04a679a249fb57751542643a436e0 h: refs/heads/master i:   369763:
 87dd84d2c8c3a2d8c2831854e5bbfe1164a72f75 v: v3

---
 [refs]                        | 2 +-
 trunk/net/netlink/genetlink.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 68629806ff9b..67e71570ec1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78d0b11dcedb21ee432d19eed1a3fa03e8f95353
+refs/heads/master: 50754d2188b04a679a249fb57751542643a436e0
diff --git a/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c
index 2f72598dd8fe..2fd6dbea327a 100644
--- a/trunk/net/netlink/genetlink.c
+++ b/trunk/net/netlink/genetlink.c
@@ -598,7 +598,7 @@ static int genl_family_rcv_msg(struct genl_family *family,
 		err = nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr,
 				  ops->policy);
 		if (err < 0)
-			return err;
+			goto out;
 	}
 
 	info.snd_seq = nlh->nlmsg_seq;
@@ -613,7 +613,7 @@ static int genl_family_rcv_msg(struct genl_family *family,
 	if (family->pre_doit) {
 		err = family->pre_doit(ops, skb, &info);
 		if (err)
-			return err;
+			goto out;
 	}
 
 	err = ops->doit(skb, &info);
@@ -621,6 +621,7 @@ static int genl_family_rcv_msg(struct genl_family *family,
 	if (family->post_doit)
 		family->post_doit(ops, skb, &info);
 
+out:
 	if (family->parallel_ops)
 		kfree(attrbuf);