mirror of
https://github.com/linux-can/can-utils.git
synced 2026-09-22 08:06:34 +02:00
treewide: use if_nametoindex to avoid overflows
replaced strcpy(if_name, argv[x]) + ioctl by if_idx = if_nametoindex(argv[x]) to avoid overflows caused by long user input. Signed-off-by: Sven Schmitt <sven.schmitt@gmx.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
committed by
Marc Kleine-Budde
parent
8af831f377
commit
f5fb7317aa
+1
-7
@@ -96,8 +96,6 @@ int main(int argc, char **argv)
|
||||
int timestamp = 0;
|
||||
int datidx = 0;
|
||||
unsigned long fflen = 0;
|
||||
struct ifreq ifr;
|
||||
int ifindex;
|
||||
struct timeval tv, last_tv;
|
||||
unsigned int n_pci;
|
||||
int opt;
|
||||
@@ -202,12 +200,8 @@ int main(int argc, char **argv)
|
||||
|
||||
setsockopt(s, SOL_CAN_RAW, CAN_RAW_FILTER, &rfilter, sizeof(rfilter));
|
||||
|
||||
strcpy(ifr.ifr_name, argv[optind]);
|
||||
ioctl(s, SIOCGIFINDEX, &ifr);
|
||||
ifindex = ifr.ifr_ifindex;
|
||||
|
||||
addr.can_family = AF_CAN;
|
||||
addr.can_ifindex = ifindex;
|
||||
addr.can_ifindex = if_nametoindex(argv[optind]);
|
||||
|
||||
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
|
||||
perror("bind");
|
||||
|
||||
Reference in New Issue
Block a user