[etherlab-users] EtherCAT Master 1.5 stable branch vs 1.5.0 release?

Thorsten Schnebeck thorsten.schnebeck at gmx.net
Thu Jan 12 11:13:23 CET 2012


Hi,

after releasing ethercat-1.5.0 stable I notices that ethercat from the 
repository 1.5-branch is not equal to the tar-package, eg:


diff -u ethercat-1.5branch/master/cdev.c ethercat-1.5.0/master/cdev.c
--- ethercat-1.5branch/master/cdev.c      2012-01-12 08:55:26.950433100 +0100
+++ ethercat-1.5.0/master/cdev.c        2012-01-10 13:03:28.000000000 +0100
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- *  $Id$
+ *  $Id: cdev.c,v 79269cfe25a7 2012/01/10 10:30:41 fp $
  *
  *  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
  *
@@ -1395,43 +1395,55 @@
         unsigned long arg /**< ioctl() argument. */
         )
 {
-    ec_ioctl_config_sdo_t data;
+    ec_ioctl_config_sdo_t *ioctl;
     const ec_slave_config_t *sc;
     const ec_sdo_request_t *req;
 
-    if (copy_from_user(&data, (void __user *) arg, sizeof(data))) {
+    if (!(ioctl = kmalloc(sizeof(*ioctl), GFP_KERNEL))) {
+        return -ENOMEM;
+    }
+
+    if (copy_from_user(ioctl, (void __user *) arg, sizeof(*ioctl))) {
+        kfree(ioctl);
         return -EFAULT;

As stable-1.5 branch is still named as pre-release I suppose that the 
repository from
http://etherlabmaster.hg.sourceforge.net/hgweb/etherlabmaster/etherlabmaster/file/6001f50617a7
is not up-to-date?  

Bye

  Thorsten



More information about the Etherlab-users mailing list