Merge tag 'upstream/1.40' into tizen.

[platform/upstream/connman.git] / plugins / ethernet.c

diff --git a/plugins/ethernet.c b/plugins/ethernet.c
index 4dda80c..766f8e4 100644 (file)
--- a/plugins/ethernet.c
+++ b/plugins/ethernet.c
@@ -54,7 +54,6 @@
 #endif
 
 #if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
-#include <connman/option.h>
 #include <gsupplicant/gsupplicant.h>
 #endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 
@@ -84,7 +83,7 @@ static int get_vlan_vid(const char *ifname)
                return -errno;
 
        vifr.cmd = GET_VLAN_VID_CMD;
-       stpncpy(vifr.device1, ifname, sizeof(vifr.device1));
+       stpncpy(vifr.device1, ifname, sizeof(vifr.device1) - 1);
 
        if(ioctl(sk, SIOCSIFVLAN, &vifr) >= 0)
                vid = vifr.u.VID;
@@ -110,14 +109,16 @@ static int get_dsa_port(const char *ifname)
                return -errno;
 
        memset(&ifr, 0, sizeof(ifr));
-       stpncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       stpncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
 
        /* check if it is a vlan and get physical interface name*/
        vifr.cmd = GET_VLAN_REALDEV_NAME_CMD;
-       stpncpy(vifr.device1, ifname, sizeof(vifr.device1));
+       stpncpy(vifr.device1, ifname, sizeof(vifr.device1) - 1);
 
-       if(ioctl(sk, SIOCSIFVLAN, &vifr) >= 0)
-               stpncpy(ifr.ifr_name, vifr.u.device2, sizeof(ifr.ifr_name));
+       if(ioctl(sk, SIOCSIFVLAN, &vifr) >= 0) {
+               stpncpy(ifr.ifr_name, vifr.u.device2, sizeof(ifr.ifr_name) - 1);
+               ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
+       }
 
        /* get driver info */
        drvinfocmd.cmd =  ETHTOOL_GDRVINFO;
@@ -254,7 +255,6 @@ static void enable_eapol_reply(DBusPendingCall *call, void *user_data)
 {
        DBusMessage *reply;
        DBusError error;
-       DBusMessageIter args;
 
        DBG("");