This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / netlink / af_netlink.c

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 9a77db7..04fb045 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -543,7 +543,7 @@ retry:
        sk = netlink_getsockbypid(ssk, pid);
        if (IS_ERR(sk)) {
                kfree_skb(skb);
-               return PTR_ERR(skb);
+               return PTR_ERR(sk);
        }
        err = netlink_attachskb(sk, skb, nonblock, timeo);
        if (err == 1)
@@ -728,14 +728,14 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
           to corresponding kernel module.   --ANK (980802)
         */
 
-       err = security_netlink_send(skb);
-       if (err) {
+       err = -EFAULT;
+       if (memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len)) {
                kfree_skb(skb);
                goto out;
        }
 
-       err = -EFAULT;
-       if (memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len)) {
+       err = security_netlink_send(sk, skb);
+       if (err) {
                kfree_skb(skb);
                goto out;
        }