2 files changed, 42 insertions, 42 deletions

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index d527c8977b1f..3baafb10f8f3 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1148,12 +1148,11 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
         if (len > sk->sk_sndbuf - 32)
                 goto out;
         err = -ENOBUFS;
-        skb = nlmsg_new(len, GFP_KERNEL);
+        skb = alloc_skb(len, GFP_KERNEL);
         if (skb==NULL)
                 goto out;
 
         NETLINK_CB(skb).pid     = nlk->pid;
-        NETLINK_CB(skb).dst_pid = dst_pid;
         NETLINK_CB(skb).dst_group = dst_group;
         NETLINK_CB(skb).loginuid = audit_get_loginuid(current->audit_context);
         selinux_get_task_sid(current, &(NETLINK_CB(skb).sid));
@@ -1435,14 +1434,13 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err)
         struct sk_buff *skb;
         struct nlmsghdr *rep;
         struct nlmsgerr *errmsg;
-        int size;
+        size_t payload = sizeof(*errmsg);
 
-        if (err == 0)
-                size = nlmsg_total_size(sizeof(*errmsg));
-        else
-                size = nlmsg_total_size(sizeof(*errmsg) + nlmsg_len(nlh));
+        /* error messages get the original request appened */
+        if (err)
+                payload += nlmsg_len(nlh);
 
-        skb = nlmsg_new(size, GFP_KERNEL);
+        skb = nlmsg_new(payload, GFP_KERNEL);
         if (!skb) {
                 struct sock *sk;
 
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 49bc2db7982b..b9b03747c1f3 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -331,7 +331,7 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
                 }
 
                 *errp = err = netlink_dump_start(genl_sock, skb, nlh,
-                                                 ops->dumpit, NULL);
+                                                 ops->dumpit, ops->done);
                 if (err == 0)
                         skb_pull(skb, min(NLMSG_ALIGN(nlh->nlmsg_len),
                                           skb->len));
@@ -384,16 +384,19 @@ static void genl_rcv(struct sock *sk, int len)
  * Controller
  **************************************************************************/
 
+static struct genl_family genl_ctrl = {
+        .id = GENL_ID_CTRL,
+        .name = "nlctrl",
+        .version = 0x1,
+        .maxattr = CTRL_ATTR_MAX,
+};
+
 static int ctrl_fill_info(struct genl_family *family, u32 pid, u32 seq,
                           u32 flags, struct sk_buff *skb, u8 cmd)
 {
-        struct nlattr *nla_ops;
-        struct genl_ops *ops;
         void *hdr;
-        int idx = 1;
 
-        hdr = genlmsg_put(skb, pid, seq, GENL_ID_CTRL, 0, flags, cmd,
-                          family->version);
+        hdr = genlmsg_put(skb, pid, seq, &genl_ctrl, flags, cmd);
         if (hdr == NULL)
                 return -1;
 
@@ -403,33 +406,39 @@ static int ctrl_fill_info(struct genl_family *family, u32 pid, u32 seq,
         NLA_PUT_U32(skb, CTRL_ATTR_HDRSIZE, family->hdrsize);
         NLA_PUT_U32(skb, CTRL_ATTR_MAXATTR, family->maxattr);
 
-        nla_ops = nla_nest_start(skb, CTRL_ATTR_OPS);
-        if (nla_ops == NULL)
-                goto nla_put_failure;
-
-        list_for_each_entry(ops, &family->ops_list, ops_list) {
-                struct nlattr *nest;
+        if (!list_empty(&family->ops_list)) {
+                struct nlattr *nla_ops;
+                struct genl_ops *ops;
+                int idx = 1;
 
-                nest = nla_nest_start(skb, idx++);
-                if (nest == NULL)
+                nla_ops = nla_nest_start(skb, CTRL_ATTR_OPS);
+                if (nla_ops == NULL)
                         goto nla_put_failure;
 
-                NLA_PUT_U32(skb, CTRL_ATTR_OP_ID, ops->cmd);
-                NLA_PUT_U32(skb, CTRL_ATTR_OP_FLAGS, ops->flags);
+                list_for_each_entry(ops, &family->ops_list, ops_list) {
+                        struct nlattr *nest;
 
-                if (ops->policy)
-                        NLA_PUT_FLAG(skb, CTRL_ATTR_OP_POLICY);
+                        nest = nla_nest_start(skb, idx++);
+                        if (nest == NULL)
+                                goto nla_put_failure;
 
-                if (ops->doit)
-                        NLA_PUT_FLAG(skb, CTRL_ATTR_OP_DOIT);
+                        NLA_PUT_U32(skb, CTRL_ATTR_OP_ID, ops->cmd);
+                        NLA_PUT_U32(skb, CTRL_ATTR_OP_FLAGS, ops->flags);
 
-                if (ops->dumpit)
-                        NLA_PUT_FLAG(skb, CTRL_ATTR_OP_DUMPIT);
+                        if (ops->policy)
+                                NLA_PUT_FLAG(skb, CTRL_ATTR_OP_POLICY);
 
-                nla_nest_end(skb, nest);
-        }
+                        if (ops->doit)
+                                NLA_PUT_FLAG(skb, CTRL_ATTR_OP_DOIT);
 
-        nla_nest_end(skb, nla_ops);
+                        if (ops->dumpit)
+                                NLA_PUT_FLAG(skb, CTRL_ATTR_OP_DUMPIT);
+
+                        nla_nest_end(skb, nest);
+                }
+
+                nla_nest_end(skb, nla_ops);
+        }
 
         return genlmsg_end(skb, hdr);
 
@@ -480,7 +489,7 @@ static struct sk_buff *ctrl_build_msg(struct genl_family *family, u32 pid,
         struct sk_buff *skb;
         int err;
 
-        skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (skb == NULL)
                 return ERR_PTR(-ENOBUFS);
 
@@ -529,7 +538,7 @@ static int ctrl_getfamily(struct sk_buff *skb, struct genl_info *info)
                 goto errout;
         }
 
-        err = genlmsg_unicast(msg, info->snd_pid);
+        err = genlmsg_reply(msg, info);
 errout:
         return err;
 }
@@ -562,13 +571,6 @@ static struct genl_ops genl_ctrl_ops = {
         .policy         = ctrl_policy,
 };
 
-static struct genl_family genl_ctrl = {
-        .id = GENL_ID_CTRL,
-        .name = "nlctrl",
-        .version = 0x1,
-        .maxattr = CTRL_ATTR_MAX,
-};
-
 static int __init genl_init(void)
 {
         int i, err;