Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-02-06 03:41:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_eoe_usermode_lock' into 'stable-1.5'

Browse Source 
ioctl.c: FIX: must take io_sem around ecrt_master_send/ecrt_master_receive

See merge request etherlab.org/ethercat!36
This commit is contained in:
Florian Pose
2022-09-05 09:11:37 +00:00
parent eb35635b77 f4e3a92352
commit 9aa5935d08
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
master/ioctl.c
View File

@@ -1899,7 +1899,9 @@ static ATTRIBUTES int ec_ioctl_send(
return -EPERM;
}
down( & master->io_sem );
ecrt_master_send(master);
up( & master->io_sem );
return 0;
}
@@ -1919,7 +1921,9 @@ static ATTRIBUTES int ec_ioctl_receive(
return -EPERM;
}
down( & master->io_sem );
ecrt_master_receive(master);
up( & master->io_sem );
return 0;
}
@@ -2018,7 +2022,9 @@ static ATTRIBUTES int ec_ioctl_sync_ref(
return -EPERM;
}
down( & master->io_sem );
ecrt_master_sync_reference_clock(master);
up( & master->io_sem );
return 0;
}
@@ -2043,7 +2049,9 @@ static ATTRIBUTES int ec_ioctl_sync_ref_to(
return -EFAULT;
}
down( & master->io_sem );
ecrt_master_sync_reference_clock_to(master, time);
up( & master->io_sem );
return 0;
}
@@ -2063,7 +2071,9 @@ static ATTRIBUTES int ec_ioctl_sync_slaves(
return -EPERM;
}
down( & master->io_sem );
ecrt_master_sync_slave_clocks(master);
up( & master->io_sem );
return 0;
}
@@ -2114,7 +2124,9 @@ static ATTRIBUTES int ec_ioctl_sync_mon_queue(
return -EPERM;
}
down( & master->io_sem );
ecrt_master_sync_monitor_queue(master);
up( & master->io_sem );
return 0;
}
@@ -3177,7 +3189,9 @@ static ATTRIBUTES int ec_ioctl_domain_queue(
return -ENOENT;
}
down( & master->io_sem );
ecrt_domain_queue(domain);
up( & master->io_sem );
return 0;
}
@@ -3895,7 +3909,9 @@ static ATTRIBUTES int ec_ioctl_voe_exec(
return -ENOENT;
}
down( & master->io_sem );
data.state = ecrt_voe_handler_execute(voe);
up( & master->io_sem );
if (data.state == EC_REQUEST_SUCCESS && voe->dir == EC_DIR_INPUT)
data.size = ecrt_voe_handler_data_size(voe);
else