netfilter: xt_physdev fixes

[safe/jmp/linux-2.6] / net / netfilter / nfnetlink.c

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index e212102..9c0ba17 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -44,27 +44,17 @@ static struct sock *nfnl = NULL;
 static const struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT];
 static DEFINE_MUTEX(nfnl_mutex);
 
-static void nfnl_lock(void)
+void nfnl_lock(void)
 {
        mutex_lock(&nfnl_mutex);
 }
+EXPORT_SYMBOL_GPL(nfnl_lock);
 
-static int nfnl_trylock(void)
-{
-       return !mutex_trylock(&nfnl_mutex);
-}
-
-static void __nfnl_unlock(void)
+void nfnl_unlock(void)
 {
        mutex_unlock(&nfnl_mutex);
 }
-
-static void nfnl_unlock(void)
-{
-       mutex_unlock(&nfnl_mutex);
-       if (nfnl->sk_receive_queue.qlen)
-               nfnl->sk_data_ready(nfnl, 0);
-}
+EXPORT_SYMBOL_GPL(nfnl_unlock);
 
 int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)
 {
@@ -111,35 +101,6 @@ nfnetlink_find_client(u_int16_t type, const struct nfnetlink_subsystem *ss)
        return &ss->cb[cb_id];
 }
 
-/**
- * nfnetlink_check_attributes - check and parse nfnetlink attributes
- *
- * subsys: nfnl subsystem for which this message is to be parsed
- * nlmsghdr: netlink message to be checked/parsed
- * cda: array of pointers, needs to be at least subsys->attr_count+1 big
- *
- */
-static int
-nfnetlink_check_attributes(const struct nfnetlink_subsystem *subsys,
-                          struct nlmsghdr *nlh, struct nlattr *cda[])
-{
-       int min_len = NLMSG_SPACE(sizeof(struct nfgenmsg));
-       u_int8_t cb_id = NFNL_MSG_TYPE(nlh->nlmsg_type);
-       u_int16_t attr_count = subsys->cb[cb_id].attr_count;
-
-       /* check attribute lengths. */
-       if (likely(nlh->nlmsg_len > min_len)) {
-               struct nlattr *attr = (void *)nlh + NLMSG_ALIGN(min_len);
-               int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
-               nla_parse(cda, attr_count, attr, attrlen, NULL);
-       }
-
-       /* implicit: if nlmsg_len == min_len, we return 0, and an empty
-        * (zeroed) cda[] array. The message is valid, but empty. */
-
-       return 0;
-}
-
 int nfnetlink_has_listeners(unsigned int group)
 {
        return netlink_has_listeners(nfnl, group);
@@ -173,12 +134,11 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                return 0;
 
        type = nlh->nlmsg_type;
+replay:
        ss = nfnetlink_get_subsys(type);
        if (!ss) {
-#ifdef CONFIG_KMOD
-               /* don't call nfnl_unlock, since it would reenter
-                * with further packet processing */
-               __nfnl_unlock();
+#ifdef CONFIG_MODULES
+               nfnl_unlock();
                request_module("nfnetlink-subsys-%d", NFNL_SUBSYS_ID(type));
                nfnl_lock();
                ss = nfnetlink_get_subsys(type);
@@ -192,35 +152,40 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                return -EINVAL;
 
        {
-               u_int16_t attr_count =
-                       ss->cb[NFNL_MSG_TYPE(nlh->nlmsg_type)].attr_count;
+               int min_len = NLMSG_SPACE(sizeof(struct nfgenmsg));
+               u_int8_t cb_id = NFNL_MSG_TYPE(nlh->nlmsg_type);
+               u_int16_t attr_count = ss->cb[cb_id].attr_count;
                struct nlattr *cda[attr_count+1];
 
-               memset(cda, 0, sizeof(struct nlattr *) * attr_count);
+               if (likely(nlh->nlmsg_len >= min_len)) {
+                       struct nlattr *attr = (void *)nlh + NLMSG_ALIGN(min_len);
+                       int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
+
+                       err = nla_parse(cda, attr_count, attr, attrlen,
+                                       ss->cb[cb_id].policy);
+                       if (err < 0)
+                               return err;
+               } else
+                       return -EINVAL;
 
-               err = nfnetlink_check_attributes(ss, nlh, cda);
-               if (err < 0)
-                       return err;
-               return nc->call(nfnl, skb, nlh, cda);
+               err = nc->call(nfnl, skb, nlh, cda);
+               if (err == -EAGAIN)
+                       goto replay;
+               return err;
        }
 }
 
-static void nfnetlink_rcv(struct sock *sk, int len)
+static void nfnetlink_rcv(struct sk_buff *skb)
 {
-       unsigned int qlen = 0;
-
-       do {
-               if (nfnl_trylock())
-                       return;
-               qlen = netlink_run_queue(sk, qlen, nfnetlink_rcv_msg);
-               __nfnl_unlock();
-       } while (qlen);
+       nfnl_lock();
+       netlink_rcv_skb(skb, &nfnetlink_rcv_msg);
+       nfnl_unlock();
 }
 
 static void __exit nfnetlink_exit(void)
 {
        printk("Removing netfilter NETLINK layer.\n");
-       sock_release(nfnl->sk_socket);
+       netlink_kernel_release(nfnl);
        return;
 }