From 60fc7e73d2c2d03c59a0969027132a6902685e08 Mon Sep 17 00:00:00 2001 From: Robert Burger Date: Fri, 29 Nov 2024 08:28:01 +0100 Subject: [PATCH] fix: strncpy on ifr_name --- src/hw_sock_raw.c | 2 +- src/hw_sock_raw_mmaped.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hw_sock_raw.c b/src/hw_sock_raw.c index 2872c85e..c50d281e 100644 --- a/src/hw_sock_raw.c +++ b/src/hw_sock_raw.c @@ -198,7 +198,7 @@ int hw_device_sock_raw_open(struct hw_sock_raw *phw_sock_raw, struct ec *pec, co ec_log(10, "HW_OPEN", "binding raw socket to %s\n", devname); (void)memset(&ifr, 0, sizeof(ifr)); - (void)strncpy(ifr.ifr_name, devname, min(strlen(devname), IFNAMSIZ)); + (void)strncpy(ifr.ifr_name, devname, min(strlen(devname), IFNAMSIZ - 1)); ioctl(phw_sock_raw->sockfd, SIOCGIFMTU, &ifr); phw_sock_raw->common.mtu_size = ifr.ifr_mtu; ec_log(10, "hw_open", "got mtu size %d\n", phw_sock_raw->common.mtu_size); diff --git a/src/hw_sock_raw_mmaped.c b/src/hw_sock_raw_mmaped.c index fb5dc7ce..4ef433e8 100644 --- a/src/hw_sock_raw_mmaped.c +++ b/src/hw_sock_raw_mmaped.c @@ -225,7 +225,7 @@ int hw_device_sock_raw_mmaped_open(struct hw_sock_raw_mmaped *phw_sock_raw_mmape ec_log(10, "HW_OPEN", "binding raw socket to %s\n", devname); (void)memset(&ifr, 0, sizeof(ifr)); - (void)strncpy(ifr.ifr_name, devname, IFNAMSIZ); + (void)strncpy(ifr.ifr_name, devname, min(strlen(devname), IFNAMSIZ - 1)); ioctl(phw_sock_raw_mmaped->sockfd, SIOCGIFMTU, &ifr); phw_sock_raw_mmaped->common.mtu_size = ifr.ifr_mtu; ec_log(10, "hw_open", "got mtu size %d\n", phw_sock_raw_mmaped->common.mtu_size);