sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added missing length check for strcpy(ifr.ifr_name, argv[x]).

pull/1/head
Sven Schmitt 2015-04-03 14:40:22 +02:00
parent 47fbe8fec2
commit 144e698dc7
9 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
canfdtest.c
View File

@ -356,6 +356,10 @@ int main(int argc, char *argv[])
}
addr.can_family = family;
if (strlen(intf_name) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", intf_name);
return 1;
}
strcpy(ifr.ifr_name, intf_name);
ioctl(sockfd, SIOCGIFINDEX, &ifr);
addr.can_ifindex = ifr.ifr_ifindex;

4
cansend.c
View File

@ -96,6 +96,10 @@ int main(int argc, char **argv)
addr.can_family = AF_CAN;
if (strlen(argv[1]) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", argv[1]);
return 1;
}
strcpy(ifr.ifr_name, argv[1]);
if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
perror("SIOCGIFINDEX");

4
isotpdump.c
View File

@ -202,6 +202,10 @@ int main(int argc, char **argv)
setsockopt(s, SOL_CAN_RAW, CAN_RAW_FILTER, &rfilter, sizeof(rfilter));
if (strlen(argv[optind]) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", argv[optind]);
return 1;
}
strcpy(ifr.ifr_name, argv[optind]);
ioctl(s, SIOCGIFINDEX, &ifr);
ifindex = ifr.ifr_ifindex;

4
isotprecv.c
View File

@ -232,6 +232,10 @@ int main(int argc, char **argv)
setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_RX_STMIN, &force_rx_stmin, sizeof(force_rx_stmin));
addr.can_family = AF_CAN;
if (strlen(argv[optind]) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", argv[optind]);
return 1;
}
strcpy(ifr.ifr_name, argv[optind]);
ioctl(s, SIOCGIFINDEX, &ifr);
addr.can_ifindex = ifr.ifr_ifindex;

4
isotpsend.c
View File

@ -224,6 +224,10 @@ int main(int argc, char **argv)
setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_TX_STMIN, &force_tx_stmin, sizeof(force_tx_stmin));
addr.can_family = AF_CAN;
if (strlen(argv[optind]) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", argv[optind]);
return 1;
}
strcpy(ifr.ifr_name, argv[optind]);
ioctl(s, SIOCGIFINDEX, &ifr);
addr.can_ifindex = ifr.ifr_ifindex;

4
isotpserver.c
View File

@ -345,6 +345,10 @@ int main(int argc, char **argv)
}
caddr.can_family = AF_CAN;
if (strlen(argv[optind]) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", argv[optind]);
return 1;
}
strcpy(ifr.ifr_name, argv[optind]);
if (ioctl(sc, SIOCGIFINDEX, &ifr) < 0) {
perror("SIOCGIFINDEX");

5
isotpsniffer.c
View File

@ -272,6 +272,11 @@ int main(int argc, char **argv)
opts.flags |= CAN_ISOTP_LISTEN_MODE;
addr.can_family = AF_CAN;
if (strlen(argv[optind]) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", argv[optind]);
return 1;
}
strcpy(ifr.ifr_name, argv[optind]);
ioctl(s, SIOCGIFINDEX, &ifr);
addr.can_ifindex = ifr.ifr_ifindex;

4
isotptun.c
View File

@ -266,6 +266,10 @@ int main(int argc, char **argv)
}
addr.can_family = AF_CAN;
if (strlen(argv[optind]) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", argv[optind]);
return 1;
}
strcpy(ifr.ifr_name, argv[optind]);
ioctl(s, SIOCGIFINDEX, &ifr);
addr.can_ifindex = ifr.ifr_ifindex;

4
slcanpty.c
View File

@ -491,6 +491,10 @@ int main(int argc, char **argv)
addr.can_family = AF_CAN;
if (strlen(argv[2]) >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", argv[2]);
return 1;
}
strcpy(ifr.ifr_name, argv[2]);
if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
perror("SIOCGIFINDEX");