10 files changed, 93 insertions, 156 deletions

diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index e1ea5dfbbb..0f9311df15 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -111,7 +111,7 @@ struct nfgenmsg {
 struct nfnl_callback
 {
         int (*call)(struct sock *nl, struct sk_buff *skb, 
-                struct nlmsghdr *nlh, struct nfattr *cda[], int *errp);
+                struct nlmsghdr *nlh, struct nfattr *cda[]);
         u_int16_t attr_count;   /* number of nfattr's */
 };
 
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 510ca7fabe..1c11518fc8 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -214,7 +214,7 @@ struct nl_info {
 
 extern void             netlink_run_queue(struct sock *sk, unsigned int *qlen,
                                           int (*cb)(struct sk_buff *,
-                                                    struct nlmsghdr *, int *));
+                                                    struct nlmsghdr *));
 extern void             netlink_queue_skip(struct nlmsghdr *nlh,
                                            struct sk_buff *skb);
 extern int              nlmsg_notify(struct sock *sk, struct sk_buff *skb,
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index b2136accd2..14241ada41 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -852,8 +852,7 @@ static int rtattr_max;
 
 /* Process one rtnetlink message. */
 
-static __inline__ int
-rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
+static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
         rtnl_doit_func doit;
         int sz_idx, kind;
@@ -863,10 +862,8 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
         int err;
 
         type = nlh->nlmsg_type;
-
-        /* Unknown message: reply with EINVAL */
         if (type > RTM_MAX)
-                goto err_inval;
+                return -EINVAL;
 
         type -= RTM_BASE;
 
@@ -875,40 +872,33 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
                 return 0;
 
         family = ((struct rtgenmsg*)NLMSG_DATA(nlh))->rtgen_family;
-        if (family >= NPROTO) {
-                *errp = -EAFNOSUPPORT;
-                return -1;
-        }
+        if (family >= NPROTO)
+                return -EAFNOSUPPORT;
 
         sz_idx = type>>2;
         kind = type&3;
 
-        if (kind != 2 && security_netlink_recv(skb, CAP_NET_ADMIN)) {
-                *errp = -EPERM;
-                return -1;
-        }
+        if (kind != 2 && security_netlink_recv(skb, CAP_NET_ADMIN))
+                return -EPERM;
 
         if (kind == 2 && nlh->nlmsg_flags&NLM_F_DUMP) {
                 rtnl_dumpit_func dumpit;
 
                 dumpit = rtnl_get_dumpit(family, type);
                 if (dumpit == NULL)
-                        goto err_inval;
-
-                if ((*errp = netlink_dump_start(rtnl, skb, nlh,
-                                                dumpit, NULL)) != 0) {
-                        return -1;
-                }
+                        return -EINVAL;
 
-                netlink_queue_skip(nlh, skb);
-                return -1;
+                err = netlink_dump_start(rtnl, skb, nlh, dumpit, NULL);
+                if (err == 0)
+                        err = -EINTR;
+                return err;
         }
 
         memset(rta_buf, 0, (rtattr_max * sizeof(struct rtattr *)));
 
         min_len = rtm_min[sz_idx];
         if (nlh->nlmsg_len < min_len)
-                goto err_inval;
+                return -EINVAL;
 
         if (nlh->nlmsg_len > min_len) {
                 int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
@@ -918,7 +908,7 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
                         unsigned flavor = attr->rta_type;
                         if (flavor) {
                                 if (flavor > rta_max[sz_idx])
-                                        goto err_inval;
+                                        return -EINVAL;
                                 rta_buf[flavor-1] = attr;
                         }
                         attr = RTA_NEXT(attr, attrlen);
@@ -927,15 +917,9 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
 
         doit = rtnl_get_doit(family, type);
         if (doit == NULL)
-                goto err_inval;
-        err = doit(skb, nlh, (void *)&rta_buf[0]);
-
-        *errp = err;
-        return err;
+                return -EINVAL;
 
-err_inval:
-        *errp = -EINVAL;
-        return -1;
+        return doit(skb, nlh, (void *)&rta_buf[0]);
 }
 
 static void rtnetlink_rcv(struct sock *sk, int len)
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 76f11f3259..443ba7753a 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -661,7 +661,7 @@ static const size_t cta_min[CTA_MAX] = {
 
 static int
 ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
-                        struct nlmsghdr *nlh, struct nfattr *cda[], int *errp)
+                        struct nlmsghdr *nlh, struct nfattr *cda[])
 {
         struct nf_conntrack_tuple_hash *h;
         struct nf_conntrack_tuple tuple;
@@ -709,7 +709,7 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
 
 static int
 ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
-                        struct nlmsghdr *nlh, struct nfattr *cda[], int *errp)
+                        struct nlmsghdr *nlh, struct nfattr *cda[])
 {
         struct nf_conntrack_tuple_hash *h;
         struct nf_conntrack_tuple tuple;
@@ -720,22 +720,15 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
         int err = 0;
 
         if (nlh->nlmsg_flags & NLM_F_DUMP) {
-                u32 rlen;
-
 #ifndef CONFIG_NF_CT_ACCT
                 if (NFNL_MSG_TYPE(nlh->nlmsg_type) == IPCTNL_MSG_CT_GET_CTRZERO)
                         return -ENOTSUPP;
 #endif
-                if ((*errp = netlink_dump_start(ctnl, skb, nlh,
-                                                ctnetlink_dump_table,
-                                                ctnetlink_done)) != 0)
-                        return -EINVAL;
-
-                rlen = NLMSG_ALIGN(nlh->nlmsg_len);
-                if (rlen > skb->len)
-                        rlen = skb->len;
-                skb_pull(skb, rlen);
-                return 0;
+                err = netlink_dump_start(ctnl, skb, nlh, ctnetlink_dump_table,
+                                         ctnetlink_done);
+                if (err == 0)
+                        err = -EINTR;
+                return err;
         }
 
         if (nfattr_bad_size(cda, CTA_MAX, cta_min))
@@ -1009,7 +1002,7 @@ err:
 
 static int