fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-16 07:10:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

dronecan: SocketCAN driver check size before copying

Browse Source 
Avoids memory corruption if we get packets to big
This commit is contained in:
Peter van der Perk
2024-05-17 12:00:55 +02:00
committed by David Sidrane
parent 470bea9ba8
commit ebfa53286f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/uavcan/uavcan_drivers/socketcan/driver/src/socketcan.cpp
+10
View File
@@ -218,12 +218,22 @@ uavcan::int16_t CanIface::receive(uavcan::CanFrame &out_frame, uavcan::Monotonic
if (_can_fd) {
struct canfd_frame *recv_frame = (struct canfd_frame *)&_recv_frame;
out_frame.id = recv_frame->can_id;
if (recv_frame->len > CANFD_MAX_DLEN) {
return -EFAULT;
}
out_frame.dlc = recv_frame->len;
memcpy(out_frame.data, &recv_frame->data, recv_frame->len);
} else {
struct can_frame *recv_frame = (struct can_frame *)&_recv_frame;
out_frame.id = recv_frame->can_id;
if (recv_frame->can_dlc > CAN_MAX_DLEN) {
return -EFAULT;
}
out_frame.dlc = recv_frame->can_dlc;
memcpy(out_frame.data, &recv_frame->data, recv_frame->can_dlc);
}