Make sure strncpy(3)d buffers are nul-terminated.

[nagiosplug.git] / plugins-root / check_dhcp.c

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 904d43ef8e4f29225403694fd0827a16a77f92c4..db673893ffb1d50a018e76740ee717bdfa89a1a8 100644 (file)
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -313,7 +313,8 @@ int get_hardware_address(int sock,char *interface_name){
 #if defined(__linux__)
        struct ifreq ifr;
 
-       strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name));
+       strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name)-1);
+       ifr.ifr_name[sizeof(ifr.ifr_name)-1]='\0';
        
        /* try and grab hardware address of requested interface */
        if(ioctl(sock,SIOCGIFHWADDR,&ifr)<0){
@@ -773,14 +774,16 @@ int create_dhcp_socket(void){
 
        /* bind socket to interface */
 #if defined(__linux__)
-       strncpy(interface.ifr_ifrn.ifrn_name,network_interface_name,IFNAMSIZ);
+       strncpy(interface.ifr_ifrn.ifrn_name,network_interface_name,IFNAMSIZ-1);
+       interface.ifr_ifrn.ifrn_name[IFNAMSIZ-1]='\0';
        if(setsockopt(sock,SOL_SOCKET,SO_BINDTODEVICE,(char *)&interface,sizeof(interface))<0){
                printf(_("Error: Could not bind socket to interface %s.  Check your privileges...\n"),network_interface_name);
                exit(STATE_UNKNOWN);
                }
 
 #else
-       strncpy(interface.ifr_name,network_interface_name,IFNAMSIZ);
+       strncpy(interface.ifr_name,network_interface_name,IFNAMSIZ-1);
+       interface.ifr_name[IFNAMSIZ-1]='\0';
 #endif
 
         /* bind the socket */