Merge branch 'master' of rtime.felk.cvut.cz:can-eth-gw-linux

[can-eth-gw-linux.git] / net / can / canethgw.c

diff --git a/net/can/canethgw.c b/net/can/canethgw.c
index 36da707cc4bfcc3947fb1245a15b2b88ac49a086..6c9c8aae64c7aa1b6c2ab6c1af42cbed85149cf1 100644 (file)
--- a/net/can/canethgw.c
+++ b/net/can/canethgw.c
@@ -20,10 +20,24 @@
 #include <net/sock.h>
 #include <linux/can.h>
 #include <linux/miscdevice.h>
-#include "canethgw.h"
+#include <linux/can/canethgw.h>
 
 MODULE_LICENSE("GPL");
 
+enum msg_types {
+       CAN_FRAME,
+};
+
+struct cegw_job
+{
+       struct kref refcount;
+       struct socket* can_sock;
+       struct socket* udp_sock;
+       u32  udp_dstcnt;
+       u32  udp_addrlen;
+       u8   udp_dst[0];
+};
+
 static int cegw_udp2can(void *data);
 static int cegw_udp_send(struct socket *udp_sock, struct can_frame *cf,
                struct sockaddr* addr, int addrlen);
@@ -37,8 +51,9 @@ static int cegw_udp_send(struct socket *udp_sock, struct can_frame *cf, struct s
                int addrlen)
 {
        struct msghdr mh;
-       struct kvec vec;
+       struct kvec vec[2];
        int err;
+       __u16 type = CAN_FRAME;
 
        mh.msg_name = addr;
        mh.msg_namelen = addrlen;
@@ -46,10 +61,13 @@ static int cegw_udp_send(struct socket *udp_sock, struct can_frame *cf, struct s
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
 
-       vec.iov_base = cf;
-       vec.iov_len = sizeof(*cf);
+       type = cpu_to_be16(type);
+       vec[0].iov_base = &type;
+       vec[0].iov_len = sizeof(type);
+       vec[1].iov_base = cf;
+       vec[1].iov_len = sizeof(*cf);
 
-       err = kernel_sendmsg(udp_sock, &mh, &vec, 1, sizeof(*cf));
+       err = kernel_sendmsg(udp_sock, &mh, vec, 2, sizeof(type)+sizeof(*cf));
 
        return err;
 }
@@ -82,26 +100,34 @@ static int cegw_can_send(struct socket* can_sock, struct can_frame* cf)
 static int cegw_udp2can(void *data)
 {
        struct can_frame cf;
-       struct kvec vec;
+       struct kvec vec[2];
        struct msghdr mh;
        struct cegw_job *job = (struct cegw_job *)data;
        struct socket *udp_sock = NULL, *can_sock = NULL;
        int ret = 0;
+       __u16 type;
 
        memset(&mh, 0, sizeof(mh));
        udp_sock = job->udp_sock;
        can_sock = job->can_sock;
 
        while (1) {
-               vec.iov_base = &cf;
-               vec.iov_len = sizeof(cf);
-               ret = kernel_recvmsg(udp_sock, &mh, &vec, 1,
-                               sizeof(cf), 0);
-               if (ret < 1)
+               vec[0].iov_base = &type;
+               vec[0].iov_len = sizeof(type);
+               vec[1].iov_base = &cf;
+               vec[1].iov_len = sizeof(cf);
+               ret = kernel_recvmsg(udp_sock, &mh, vec, 2,
+                                    sizeof(type) + sizeof(cf), 0);
+               if (ret != sizeof(type) + sizeof(cf))
                        break;
 
-               cf.can_id = be32_to_cpu(cf.can_id);
-               cegw_can_send(can_sock, &cf);
+               type = be16_to_cpu(type);
+               switch (type) {
+               case CAN_FRAME:
+                       cf.can_id = be32_to_cpu(cf.can_id);
+                       cegw_can_send(can_sock, &cf);
+               default:;
+               }
        }
 
        cegw_thread_stop(job);
@@ -133,8 +159,8 @@ static int cegw_can2udp(void* data)
                vec.iov_len = sizeof(cf);
 
                ret = kernel_recvmsg(can_sock, &mh, &vec, 1,
-                                          sizeof(cf), 0);
-               if (ret < 1)
+                                    sizeof(cf), 0);
+               if (ret != sizeof(cf))
                        break;
 
                cf.can_id = cpu_to_be32(cf.can_id);
@@ -171,14 +197,14 @@ static int cegw_thread_start(void *data)
        struct cegw_job *job = (struct cegw_job *)data;
 
        kref_init(&job->refcount);
-       kref_get(&job->refcount);
 
        task = kthread_run(cegw_udp2can, data, "canethgw_udp2can");
        if (IS_ERR(task)) {
-               kref_sub(&job->refcount, 2, cegw_job_release);
+               kref_put(&job->refcount, cegw_job_release);
                return -ENOMEM;
        }
 
+       kref_get(&job->refcount);
        task = kthread_run(cegw_can2udp, data, "canethgw_can2udp");
        if (IS_ERR(task)) {
                cegw_thread_stop(job);
@@ -270,8 +296,8 @@ static long cegw_ioctl_start(struct file *file, unsigned long arg)
 
        err = copy_from_user(&job->udp_dst, (void __user *)(arg + sizeof(struct cegw_ioctl)), dstcnt*addrlen);
        if (err != 0) {
-               kfree(job);
-               return -EFAULT;
+               err = -EFAULT;
+               goto err_free;
        }
 
        /* */
@@ -282,22 +308,23 @@ static long cegw_ioctl_start(struct file *file, unsigned long arg)
        for (i=1; i<dstcnt; i++) {
                sa = (struct sockaddr *)(job->udp_dst + i*addrlen);
                if (sa->sa_family != chckfam) {
-                       kfree(job);
-                       return -EAFNOSUPPORT;
+                       err = -EAFNOSUPPORT;
+                       goto err_free;
                }
        }
 
        job->udp_sock = sockfd_lookup(gwctl.udp_sock, &err);
-       if (job->udp_sock == NULL) {
-               kfree(job);
-               return err;
-       }
+       if (job->udp_sock == NULL)
+               goto err_free;
 
        job->can_sock = sockfd_lookup(gwctl.can_sock, &err);
-       if (job->can_sock == NULL) {
-               fput(job->udp_sock->file);
-               kfree(job);
-               return err;
+       if (job->can_sock == NULL)
+               goto err_put_udp;
+
+       if (job->can_sock->ops->family != AF_CAN ||
+           job->can_sock->type != SOCK_RAW) {
+               err = -EBADF;
+               goto err_put_all;
        }
 
        job->udp_dstcnt = dstcnt;
@@ -305,15 +332,23 @@ static long cegw_ioctl_start(struct file *file, unsigned long arg)
 
        err = cegw_thread_start(job);
        if (err != 0)
-               return err;
+               return err; /* cegw_thread_start performs cleaup for us.  */
 
        file->private_data = job;
        return 0;
+
+err_put_all:
+       fput(job->can_sock->file);
+err_put_udp:
+       fput(job->udp_sock->file);
+err_free:
+       kfree(job);
+       return err;
 }
 
 static long cegw_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       int err;
+       long err;
 
        switch (cmd) {
                case CEGW_IOCTL_START:
@@ -342,9 +377,8 @@ static struct miscdevice cegw_device = {
 
 static int __init cegw_init(void)
 {
-       misc_register(&cegw_device);
-
-       return 0;
+       pr_info("can: can-eth gateway\n");
+       return misc_register(&cegw_device);
 }
 
 static void __exit cegw_exit(void)
@@ -356,4 +390,3 @@ static void __exit cegw_exit(void)
 
 module_init(cegw_init);
 module_exit(cegw_exit);
-